Add Ascii range to Token.

jruby · Apr 3, 2015 · a0910bb · a0910bb
1 parent a371656
commit a0910bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/org/joni/Lexer.java b/src/org/joni/Lexer.java
@@ -756,7 +756,7 @@ private void fetchTokenFor_openBrace() {
 
     private void fetchTokenFor_anchor(int subType) {
         token.type = TokenType.ANCHOR;
-        token.setAnchor(subType);
+        token.setAnchorSubtype(subType);
     }
 
     private void fetchTokenFor_xBrace() {

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
@@ -865,7 +865,7 @@ private Node parseExp(TokenType term) {
             break;
 
         case ANCHOR:
-            node = new AnchorNode(token.getAnchor()); // possible bug in oniguruma
+            node = new AnchorNode(token.getAnchorSubtype());
             break;
 
         case OP_REPEAT:

diff --git a/src/org/joni/Token.java b/src/org/joni/Token.java
@@ -46,18 +46,19 @@ void setCode(int code) {
         INT1 = code;
     }
 
-    int getAnchor() {
+    int getAnchorSubtype() {
         return INT1;
     }
-    void setAnchor(int anchor) {
+    void setAnchorSubtype(int anchor) {
         INT1 = anchor;
     }
 
-    int getSubtype() {
-        return INT1;
+    boolean getAnchorASCIIRange() {
+        return INT2 == 1;
     }
-    void setSubtype(int subtype) {
-        INT1 = subtype;
+
+    void setAnchorASCIIRange(boolean ascii) {
+        INT2 = ascii ? 1 : 0;
     }
 
     // repeat union member