[jruby-joni] 78/194: refactor enclose

[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 4a575f5dcf7643b9dfde857b118828f1855d5b57
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Sun Dec 31 13:51:33 2017 +0100

    refactor enclose
---
 src/org/joni/Parser.java          | 18 +++++++++---------
 src/org/joni/ast/EncloseNode.java | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 69457d0..cf35c76 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -505,7 +505,7 @@ class Parser extends Lexer {
                             unfetch();
                         }
                     } // USE_NAMED_GROUP
-                    EncloseNode en = new EncloseNode(env.option, false); // node_new_enclose_memory
+                    EncloseNode en = EncloseNode.newMemory(env.option, false);
                     int num = env.addMemEntry();
                     if (num >= BitStatus.BIT_STATUS_BITS_NUM) newValueException(ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY);
                     en.regNum = num;
@@ -666,7 +666,7 @@ class Parser extends Lexer {
                     } // switch
 
                     if (c == ')') {
-                        EncloseNode en = new EncloseNode(option, 0); // node_new_option
+                        EncloseNode en = EncloseNode.newOption(option);
                         node = en;
                         returnCode = 2; /* option only */
                         return node;
@@ -676,7 +676,7 @@ class Parser extends Lexer {
                         fetchToken();
                         Node target = parseSubExp(term);
                         env.option = prev;
-                        EncloseNode en = new EncloseNode(option, 0); // node_new_option
+                        EncloseNode en = EncloseNode.newOption(option);
                         en.setTarget(target);
                         node = en;
                         returnCode = 0;
@@ -697,7 +697,7 @@ class Parser extends Lexer {
                 returnCode = 1; /* group */
                 return node;
             }
-            EncloseNode en = new EncloseNode(env.option, false); // node_new_enclose_memory
+            EncloseNode en = EncloseNode.newMemory(env.option, false);
             int num = env.addMemEntry();
             en.regNum = num;
             node = en;
@@ -739,7 +739,7 @@ class Parser extends Lexer {
         if (listCapture && num >= BitStatus.BIT_STATUS_BITS_NUM) newValueException(ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY);
 
         regex.nameAdd(bytes, nm, nameEnd, num, syntax);
-        EncloseNode en = new EncloseNode(env.option, true); // node_new_enclose_memory
+        EncloseNode en = EncloseNode.newMemory(env.option, true);
         en.regNum = num;
 
         Node node = en;
@@ -1225,7 +1225,7 @@ class Parser extends Lexer {
             /* PerlSyntax: (?s:.), RubySyntax: (?m:.) */
             AnyCharNode any = new AnyCharNode();
             int option = bsOnOff(env.option, Option.MULTILINE, false);
-            EncloseNode enclose = new EncloseNode(option, 0);
+            EncloseNode enclose = EncloseNode.newOption(option);
             enclose.setTarget(any);
 
             alt = ConsAltNode.newAltNode(enclose, null);
@@ -1251,7 +1251,7 @@ class Parser extends Lexer {
             /* PerlSyntax: (?s:.), RubySyntax: (?m:.) */
             AnyCharNode any = new AnyCharNode();
             int option = bsOnOff(env.option, Option.MULTILINE, false);
-            EncloseNode enclose = new EncloseNode(option, 0);
+            EncloseNode enclose = EncloseNode.newOption(option);
             enclose.setTarget(any);
             alt = ConsAltNode.newAltNode(enclose, null);
         }
@@ -1269,7 +1269,7 @@ class Parser extends Lexer {
 
         if (Config.USE_UNICODE_PROPERTIES && enc.isUnicode()) {
             int option = bsOnOff(env.option, Option.IGNORECASE, true);
-            EncloseNode enc = new EncloseNode(option, 0);
+            EncloseNode enc = EncloseNode.newOption(option);
             enc.setTarget(enclose);
             return enc;
         } else {
@@ -1629,7 +1629,7 @@ class Parser extends Lexer {
         if (Config.USE_SUBEXP_CALL) {
             if (env.numCall > 0) {
                 /* Capture the pattern itself. It is used for (?R), (?0) and \g<0>. */
-                EncloseNode np = new EncloseNode(env.option, false);
+                EncloseNode np = EncloseNode.newMemory(env.option, false);
                 np.regNum = 0;
                 np.setTarget(top);
                 if (env.memNodes ==  null) env.memNodes = new Node[Config.SCANENV_MEMNODES_SIZE];
diff --git a/src/org/joni/ast/EncloseNode.java b/src/org/joni/ast/EncloseNode.java
index cefe130..d5c5ea3 100644
--- a/src/org/joni/ast/EncloseNode.java
+++ b/src/org/joni/ast/EncloseNode.java
@@ -33,7 +33,7 @@ public final class EncloseNode extends StateNode implements EncloseType {
     public int maxLength;           // OnigDistance
     public int charLength;
     public int optCount;            // referenced count in optimize_node_left()
-    public Node containingAnchor;   // 
+    public Node containingAnchor;   //
 
     // node_new_enclose / onig_node_new_enclose
     public EncloseNode(int type) {
@@ -41,17 +41,17 @@ public final class EncloseNode extends StateNode implements EncloseType {
         callAddr = -1;
     }
 
-    // node_new_enclose_memory
-    public EncloseNode(int option, boolean isNamed) {
-        this(MEMORY);
-        if (isNamed) setNamedGroup();
-        if (Config.USE_SUBEXP_CALL) this.option = option;
+    public static EncloseNode newMemory(int option, boolean isNamed) {
+        EncloseNode en = new EncloseNode(MEMORY);
+        if (Config.USE_SUBEXP_CALL) en.option = option;
+        if (isNamed) en.setNamedGroup();
+        return en;
     }
 
-    // node_new_option
-    public EncloseNode(int option, int _) {
-        this(OPTION);
-        this.option = option;
+    public static EncloseNode newOption(int option) {
+        EncloseNode en = new EncloseNode(OPTION);
+        en.option = option;
+        return en;
     }
 
     @Override

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