Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to RFC7159 (closes #90) #101

Merged
merged 15 commits into from
Aug 11, 2014
Merged

Move to RFC7159 (closes #90) #101

merged 15 commits into from
Aug 11, 2014

Conversation

pah
Copy link
Contributor

@pah pah commented Aug 11, 2014

As mentioned in #90, the restriction to object or array root elements has been dropped with the updated JSON RFC (RFC7159). This pull-request removes the restriction from the RapidJSON implementation.

The unit tests are updated to check the new behaviour.

@thebusytypist: Could you please review the changes to the iterative parser (c9f2715)? (The whitespace changes have been fixed in 453eda5)

pah added 15 commits August 11, 2014 17:14
With the allowance of arbitrary root value types, the individual tests
can use the top-level Parse functions, instead of ParseFoo() variants.

Secondly, some unneeded array wrappers have been dropped and non-singular
tests starting with other values than objects or arrays have been added.
By adding an optional CRTP template parameter, the BaseReaderHandler
can call the "overridden" `Default()` function from the `Derived`
class.

See https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
miloyip added a commit that referenced this pull request Aug 11, 2014
@miloyip miloyip merged commit 143bb83 into Tencent:master Aug 11, 2014
@pah pah deleted the feature/rfc7159 branch August 11, 2014 16:25
pah added a commit to pah/rapidjson that referenced this pull request Aug 11, 2014
This drops #3 and #4, as their functionality has been superseded
upstream, see Tencent/rapidjson#97 and Tencent/rapidjson#101.

Conflicts:
	include/rapidjson/prettywriter.h
	include/rapidjson/reader.h
	include/rapidjson/writer.h
@miloyip miloyip mentioned this pull request Nov 30, 2014
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants