[jruby-joni] 123/223: remove those pesky 'hidden' vars.

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 6b60e96da59fca4541294c395c9c2270e3aac03a
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Sun Mar 11 21:18:49 2012 +0100

    remove those pesky 'hidden' vars.
---
 src/org/joni/Parser.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 98e03d1..3d56e9e 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -24,6 +24,7 @@ import static org.joni.BitStatus.bsOnOff;
 import static org.joni.Option.isDontCaptureGroup;
 import static org.joni.Option.isIgnoreCase;
 
+import org.jcodings.Ptr;
 import org.jcodings.constants.CharacterType;
 import org.jcodings.constants.PosixBracket;
 import org.joni.ast.AnchorNode;
@@ -608,8 +609,7 @@ class Parser extends Lexer {
         return node;
     }
 
-    private int nextChar; // hidden var
-    private int findStrPosition(int[]s, int n, int from, int to) {
+    private int findStrPosition(int[]s, int n, int from, int to, Ptr nextChar) {
         int x;
         int q;
         int p = from;
@@ -624,7 +624,7 @@ class Parser extends Lexer {
                     q += enc.length(bytes, q, to);
                 }
                 if (i >= n) {
-                    if (bytes[nextChar] != 0) nextChar = q; // we may need zero term semantics...
+                    if (bytes[nextChar.p] != 0) nextChar.p = q; // we may need zero term semantics...
                     return p;
                 }
             }
@@ -681,12 +681,11 @@ class Parser extends Lexer {
         case QUOTE_OPEN:
             int[]endOp = new int[]{syntax.metaCharTable.esc, 'E'};
             int qstart = p;
-            int qend = findStrPosition(endOp, endOp.length, qstart, stop); // will set nextChar!!!
-            if (qend == -1) {
-                nextChar = qend = stop;
-            }
+            Ptr nextChar = new Ptr();
+            int qend = findStrPosition(endOp, endOp.length, qstart, stop, nextChar);
+            if (qend == -1) nextChar.p = qend = stop;
             node = new StringNode(bytes, qstart, qend);
-            p = nextChar;
+            p = nextChar.p;
             break;
 
         case CHAR_TYPE:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git