diff options
| author | Florian Frank <flori@ping.de> | 2011-01-05 00:12:51 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-01-05 00:12:51 +0100 |
| commit | 0b15820e245f4048d1bcd29cd60693e4e211ab43 (patch) | |
| tree | abffda1af3d23b47739d88fd089609cffa378ed7 /java | |
| parent | c87f6f3022f9b7c1b1317e958976e2ed6d4f4ae4 (diff) | |
| download | json-0b15820e245f4048d1bcd29cd60693e4e211ab43.tar.gz | |
renamed :match argument to :match_stringv1.5.0
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/json/ext/Parser.java | 10 | ||||
| -rw-r--r-- | java/src/json/ext/Parser.rl | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/java/src/json/ext/Parser.java b/java/src/json/ext/Parser.java index f6e9c4e..c92600e 100644 --- a/java/src/json/ext/Parser.java +++ b/java/src/json/ext/Parser.java @@ -53,7 +53,7 @@ public class Parser extends RubyObject { private boolean symbolizeNames; private RubyClass objectClass; private RubyClass arrayClass; - private RubyHash match; + private RubyHash match_string; private static final int DEFAULT_MAX_NESTING = 19; @@ -155,7 +155,7 @@ public class Parser extends RubyObject { this.createAdditions = opts.getBool("create_additions", true); this.objectClass = opts.getClass("object_class", runtime.getHash()); this.arrayClass = opts.getClass("array_class", runtime.getArray()); - this.match = opts.getHash("match"); + this.match_string = opts.getHash("match_string"); this.vSource = source; return this; @@ -1383,11 +1383,11 @@ case 5: // line 554 "Parser.rl" if (parser.createAdditions) { - RubyHash match = parser.match; - if (match != null) { + RubyHash match_string = parser.match_string; + if (match_string != null) { final IRubyObject[] memoArray = { result, null }; try { - match.visitAll(new RubyHash.Visitor() { + match_string.visitAll(new RubyHash.Visitor() { @Override public void visit(IRubyObject pattern, IRubyObject klass) { if (pattern.callMethod(context, "===", memoArray[0]).isTrue()) { diff --git a/java/src/json/ext/Parser.rl b/java/src/json/ext/Parser.rl index a79ead5..e576b97 100644 --- a/java/src/json/ext/Parser.rl +++ b/java/src/json/ext/Parser.rl @@ -51,7 +51,7 @@ public class Parser extends RubyObject { private boolean symbolizeNames; private RubyClass objectClass; private RubyClass arrayClass; - private RubyHash match; + private RubyHash match_string; private static final int DEFAULT_MAX_NESTING = 19; @@ -153,7 +153,7 @@ public class Parser extends RubyObject { this.createAdditions = opts.getBool("create_additions", true); this.objectClass = opts.getClass("object_class", runtime.getHash()); this.arrayClass = opts.getClass("array_class", runtime.getArray()); - this.match = opts.getHash("match"); + this.match_string = opts.getHash("match_string"); this.vSource = source; return this; @@ -553,11 +553,11 @@ public class Parser extends RubyObject { %% write exec; if (parser.createAdditions) { - RubyHash match = parser.match; - if (match != null) { + RubyHash match_string = parser.match_string; + if (match_string != null) { final IRubyObject[] memoArray = { result, null }; try { - match.visitAll(new RubyHash.Visitor() { + match_string.visitAll(new RubyHash.Visitor() { @Override public void visit(IRubyObject pattern, IRubyObject klass) { if (pattern.callMethod(context, "===", memoArray[0]).isTrue()) { |