Merge pull request #529 from groovy/groovy26

groovy · Mar 14, 2018 · f95b64b · f95b64b
2 parents 3788789 + ab7c421
commit f95b64b
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/base/org.codehaus.groovy26/src/org/codehaus/groovy/ast/ASTNode.java b/base/org.codehaus.groovy26/src/org/codehaus/groovy/ast/ASTNode.java
@@ -54,11 +54,10 @@ public class ASTNode implements NodeMetaDataHandler {
     private int lastLineNumber = -1;
     private int lastColumnNumber = -1;
     // GRECLIPSE add
-    private int start = 0;
-    private int stop = 0;
+    private final int[] offsets = new int[2];
     // GRECLIPSE end
     private Map metaDataMap;
-    private NodeMetaDataHandlerHelper helper = new NodeMetaDataHandlerHelper(this);
+    private final NodeMetaDataHandlerHelper helper = new NodeMetaDataHandlerHelper(this);
 
     public void visit(GroovyCodeVisitor visitor) {
         throw new RuntimeException("No visit() method implemented for class: " + getClass().getName());
@@ -102,19 +101,19 @@ public void setLastColumnNumber(int lastColumnNumber) {
 
     // GRECLIPSE add
     public int getStart() {
-        return start;
+        return offsets[0];
     }
     public void setStart(int offset) {
-        start = offset;
+        offsets[0] = offset;
     }
     public int getEnd() {
-        return stop;
+        return offsets[1];
     }
     public void setEnd(int offset) {
-        stop = offset;
+        offsets[1] = offset;
     }
     public int getLength() {
-        return (stop > 0 && start >= 0 ? stop - start : -1);
+        return (offsets[1] >= 0 && offsets[0] >= 0 ? offsets[1] - offsets[0] : -1);
     }
     // GRECLIPSE end
 
@@ -132,8 +131,8 @@ public void setSourcePosition(ASTNode node) {
         this.lastColumnNumber = node.getLastColumnNumber();
         this.lineNumber = node.getLineNumber();
         // GRECLIPSE add
-        this.start = node.getStart();
-        this.stop = node.getEnd();
+        this.offsets[0] = node.getStart();
+        this.offsets[1] = node.getEnd();
         // GRECLIPSE end
     }
 
@@ -185,10 +184,12 @@ public void setMetaDataMap(Map<?, ?> metaDataMap) {
         this.metaDataMap = metaDataMap;
     }
 
+    /* GRECLIPSE edit
     @Override
     public boolean equals(Object o) {
         return this == o;
     }
+    */
 
     @Override
     public int hashCode() {