You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/11 15:59:41 UTC
[14/50] git commit: [flex-falcon]
[refs/heads/feature/maven-migration] - ASParser: object and array literals
should include starting { or [
ASParser: object and array literals should include starting { or [
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ea51f072
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ea51f072
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ea51f072
Branch: refs/heads/feature/maven-migration
Commit: ea51f07258b3c1d830f9f8da88ac53f3eb6e55fe
Parents: e89e375
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Mar 30 16:32:37 2016 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Mar 30 16:32:37 2016 -0700
----------------------------------------------------------------------
.../src/org/apache/flex/compiler/internal/parsing/as/ASParser.g | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ea51f072/compiler/src/org/apache/flex/compiler/internal/parsing/as/ASParser.g
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/ASParser.g b/compiler/src/org/apache/flex/compiler/internal/parsing/as/ASParser.g
index 5bdbd44..443aaeb 100644
--- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/ASParser.g
+++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/ASParser.g
@@ -2414,7 +2414,7 @@ objectLiteralExpression returns [ExpressionNodeBase n]
ContainerNode b = o.getContentsNode();
ExpressionNodeBase vp = null;
}
- : openT:TOKEN_BLOCK_OPEN { n.startAfter(openT); }
+ : openT:TOKEN_BLOCK_OPEN { n.startBefore(openT); }
( vp=objectLiteralValuePair { b.addItem(vp); }
( TOKEN_COMMA vp=objectLiteralValuePair
{ if (vp != null) b.addItem(vp); }
@@ -2481,7 +2481,7 @@ arrayInitializer [ArrayLiteralNode node]
{
final ContainerNode contents = node.getContentsNode();
}
- : open:TOKEN_SQUARE_OPEN { contents.startAfter(open); }
+ : open:TOKEN_SQUARE_OPEN { contents.startBefore(open); }
arrayElements[contents]
close:TOKEN_SQUARE_CLOSE { contents.endAfter(close); }
;