You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2016/04/29 20:13:45 UTC

[2/6] git commit: [flex-falcon] [refs/heads/develop] - compiler: some cleanup of start and end positions on nodes

compiler: some cleanup of start and end positions on nodes


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/79f0304c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/79f0304c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/79f0304c

Branch: refs/heads/develop
Commit: 79f0304c5636b74b76726f2eb18ec6cd06749326
Parents: 4f0930b
Author: Josh Tynjala <jo...@gmail.com>
Authored: Fri Apr 29 09:44:37 2016 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Fri Apr 29 09:44:37 2016 -0700

----------------------------------------------------------------------
 .../compiler/internal/tree/as/BaseStatementExpressionNode.java   | 4 +---
 .../flex/compiler/internal/tree/as/ExpressionNodeBase.java       | 2 ++
 .../apache/flex/compiler/internal/tree/as/IterationFlowNode.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79f0304c/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/BaseStatementExpressionNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/BaseStatementExpressionNode.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/BaseStatementExpressionNode.java
index 268fe4f..49d1619 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/BaseStatementExpressionNode.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/BaseStatementExpressionNode.java
@@ -103,9 +103,7 @@ public abstract class BaseStatementExpressionNode extends ExpressionNodeBase
         if (expressionNode != null)
         {
             expressionNode.setParent(this);
-            setEnd(expressionNode.getAbsoluteEnd());
-            setEndLine(expressionNode.getEndLine());
-            setEndColumn(expressionNode.getEndColumn());
+            endAfter(expressionNode);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79f0304c/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ExpressionNodeBase.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ExpressionNodeBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ExpressionNodeBase.java
index 4e8d067..6c514b7 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ExpressionNodeBase.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ExpressionNodeBase.java
@@ -63,6 +63,8 @@ public abstract class ExpressionNodeBase extends FixedChildrenNode implements IE
         this.setColumn(other.getColumn());
         this.setStart(other.getAbsoluteStart());
         this.setEnd(other.getAbsoluteEnd());
+        this.setEndLine(other.getEndLine());
+        this.setEndColumn(other.getEndColumn());
     }
 
     protected int flags;

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79f0304c/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/IterationFlowNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/IterationFlowNode.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/IterationFlowNode.java
index b8dee74..e135c09 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/IterationFlowNode.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/IterationFlowNode.java
@@ -129,6 +129,6 @@ public class IterationFlowNode extends FixedChildrenNode implements IIterationFl
     {
         this.labelNode = labelNode;
         labelNode.setParent(this);
-        setEnd(labelNode.getAbsoluteEnd());
+        endAfter(labelNode);
     }
 }