Skip to content

Commit

Permalink
Always use underscore for match string
Browse files Browse the repository at this point in the history
  • Loading branch information
flori committed Feb 21, 2019
1 parent 0e97fd4 commit aff3d4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions java/src/json/ext/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -165,7 +165,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
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(
Expand Down Expand Up @@ -1437,7 +1437,7 @@ else if ( data[p] > _JSON_string_trans_keys[_mid+1] )
// 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 {
Expand Down
2 changes: 1 addition & 1 deletion java/src/json/ext/Parser.rl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit aff3d4b

Please sign in to comment.