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

Fix some typos #467

Merged
merged 1 commit into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

## 2015-09-11 (2.0.0)
* Now complies to newest JSON RFC 7159.
* Implements compatibiliy to ruby 2.4 integer unification.
* Implements compatibility to ruby 2.4 integer unification.
* Drops support for old rubies whose life has ended, that is rubies < 2.0.
Also see https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/
* There were still some mentions of dual GPL licensing in the source, but JSON
Expand Down Expand Up @@ -124,9 +124,9 @@
## 2013-02-04 (1.7.7)
* Security fix for JSON create_additions default value and
`JSON::GenericObject`. It should not be possible to create additions unless
explicitely requested by setting the create_additions argument to true or
explicitly requested by setting the create_additions argument to true or
using the JSON.load/dump interface. If `JSON::GenericObject` is supposed to
be automatically deserialised, this has to be explicitely enabled by
be automatically deserialised, this has to be explicitly enabled by
setting
JSON::GenericObject.json_creatable = true
as well.
Expand Down Expand Up @@ -272,7 +272,7 @@
## 2010-04-23 (1.4.0)
* Major speed improvements and building with simplified
directory/file-structure.
* Extension should at least be comapatible with MRI, YARV and Rubinius.
* Extension should at least be compatible with MRI, YARV and Rubinius.

## 2010-04-07 (1.2.4)
* Triger const_missing callback to make Rails' dynamic class loading work.
Expand All @@ -290,7 +290,7 @@
strings in object names/keys.

## 2009-10-01 (1.2.0)
* `fast_generate` now raises an exeception for nan and infinite floats.
* `fast_generate` now raises an exception for nan and infinite floats.
* On Ruby 1.8 json supports parsing of UTF-8, UTF-16BE, UTF-16LE, UTF-32BE,
and UTF-32LE JSON documents now. Under Ruby 1.9 the M17n conversion
functions are used to convert from all supported encodings. ASCII-8BIT
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ the `pp` library's `pp` methods.

The script `tools/server.rb` contains a small example if you want to test, how
receiving a JSON object from a webrick server in your browser with the
javasript prototype library http://www.prototypejs.org works.
JavaScript prototype library http://www.prototypejs.org works.

## Speed Comparisons

Expand All @@ -294,7 +294,7 @@ extension:
```

In the table above 1 is `JSON::Ext::Parser`, 2 is `YAML.load` with YAML
compatbile JSON document, 3 is is `JSON::Pure::Parser`, and 4 is
compatible JSON document, 3 is is `JSON::Pure::Parser`, and 4 is
`ActiveSupport::JSON.decode`. The ActiveSupport JSON-decoder converts the
input first to YAML and then uses the YAML-parser, the conversion seems to
slow it down so much that it is only as fast as the `JSON::Pure::Parser`!
Expand Down
2 changes: 1 addition & 1 deletion java/src/json/ext/GeneratorState.java
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ public int decreaseDepth() {
/**
* Checks if the current depth is allowed as per this state's options.
* @param context
* @param depth The corrent depth
* @param depth The current depth
*/
private void checkMaxNesting() {
if (maxNesting != 0 && depth > maxNesting) {
Expand Down
2 changes: 1 addition & 1 deletion json_pure.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.email = "[email protected]".freeze

s.extra_rdoc_files = ["README.md".freeze]
s.rdoc_options = ["--title".freeze, "JSON implemention for ruby".freeze, "--main".freeze, "README.md".freeze]
s.rdoc_options = ["--title".freeze, "JSON implementation for ruby".freeze, "--main".freeze, "README.md".freeze]
s.files = [
"CHANGES.md".freeze,
"Gemfile".freeze,
Expand Down
2 changes: 1 addition & 1 deletion lib/json/pure/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Parser < StringScanner
/(?=\*/) # single slash before this comment's end
)*
\*/ # the End of this comment
|[ \t\r\n]+ # whitespaces: space, horicontal tab, lf, cr
|[ \t\r\n]+ # whitespaces: space, horizontal tab, lf, cr
)+
)mx

Expand Down