diff options
author | Florian Frank <flori@ping.de> | 2019-02-21 22:37:40 +0100 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2019-02-21 23:12:31 +0100 |
commit | aff3d4b1fd7c13dac94dc936089a2c332747f593 (patch) | |
tree | d489f2314d164702c25132d57e6fda7ba92328cf /java | |
parent | 0e97fd419328dd8add71c451222fa219a8f8fa1e (diff) | |
download | json-aff3d4b1fd7c13dac94dc936089a2c332747f593.tar.gz |
Always use underscore for match string
Diffstat (limited to 'java')
-rw-r--r-- | java/src/json/ext/Parser.java | 6 | ||||
-rw-r--r-- | java/src/json/ext/Parser.rl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/json/ext/Parser.java b/java/src/json/ext/Parser.java index 2ba9f8f..647afca 100644 --- a/java/src/json/ext/Parser.java +++ b/java/src/json/ext/Parser.java @@ -55,7 +55,7 @@ public class Parser extends RubyObject { private RubyClass objectClass; private RubyClass arrayClass; private RubyClass decimalClass; - private RubyHash matchString; + private RubyHash match_string; private static final int DEFAULT_MAX_NESTING = 100; @@ -165,7 +165,7 @@ public class Parser extends RubyObject { this.objectClass = opts.getClass("object_class", runtime.getHash()); this.arrayClass = opts.getClass("array_class", runtime.getArray()); this.decimalClass = opts.getClass("decimal_class", null); - this.matchString = opts.getHash("match_string"); + this.match_string = opts.getHash("match_string"); if(symbolizeNames && createAdditions) { throw runtime.newArgumentError( @@ -1437,7 +1437,7 @@ case 5: // line 608 "Parser.rl" if (parser.createAdditions) { - RubyHash matchString = parser.matchString; + RubyHash matchString = parser.match_string; if (matchString != null) { final IRubyObject[] memoArray = { result, null }; try { diff --git a/java/src/json/ext/Parser.rl b/java/src/json/ext/Parser.rl index 4d170e1..c0c72ad 100644 --- a/java/src/json/ext/Parser.rl +++ b/java/src/json/ext/Parser.rl @@ -607,7 +607,7 @@ public class Parser extends RubyObject { %% write exec; if (parser.createAdditions) { - RubyHash matchString = parser.matchString; + RubyHash matchString = parser.match_string; if (matchString != null) { final IRubyObject[] memoArray = { result, null }; try { |