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/07 02:26:49 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] -
IdentifierEmitter: added missing source map for certain types of identifier
Repository: flex-falcon
Updated Branches:
refs/heads/develop 3e5e4fed0 -> 88a9bc28c
IdentifierEmitter: added missing source map for certain types of identifier
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/40604f56
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/40604f56
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/40604f56
Branch: refs/heads/develop
Commit: 40604f56b6c60ea986c2572bfec076244940553b
Parents: 3e5e4fe
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Apr 6 17:25:58 2016 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Apr 6 17:25:58 2016 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/js/jx/IdentifierEmitter.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/40604f56/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 69217c1..b8a9703 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -217,7 +217,7 @@ public class IdentifierEmitter extends JSSubEmitter implements
//member access expression, it shouldn't be fully qualified
needsFormattedName = parentMemberAccessNode.getLeftOperandNode() == node;
}
- getEmitter().startMapping(node);
+ startMapping(node);
if (parentNodeId == ASTNodeID.MemberAccessExpressionID)
{
if (needsFormattedName)
@@ -235,10 +235,14 @@ public class IdentifierEmitter extends JSSubEmitter implements
write(getEmitter().formatQualifiedName(qname));
else
write(qname);
- getEmitter().endMapping(node);
+ endMapping(node);
}
else
+ {
+ startMapping(node);
write(node.getName());
+ endMapping(node);
+ }
}
}
[2/2] git commit: [flex-falcon] [refs/heads/develop] -
ObjectLiteralValuePairEmitter: does not create mapping for key in object
literal value pair because another emitter will handle that (such as
IdentifierEmitter)
Posted by jo...@apache.org.
ObjectLiteralValuePairEmitter: does not create mapping for key in object literal value pair because another emitter will handle that (such as IdentifierEmitter)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/88a9bc28
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/88a9bc28
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/88a9bc28
Branch: refs/heads/develop
Commit: 88a9bc28c44b7af39290b01350deee76af7b4ee3
Parents: 40604f5
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Apr 6 17:26:42 2016 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Apr 6 17:26:42 2016 -0700
----------------------------------------------------------------------
.../codegen/js/jx/ObjectLiteralValuePairEmitter.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/88a9bc28/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
index 0c36871..d93d701 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
@@ -25,7 +25,6 @@ import org.apache.flex.compiler.common.ISourceLocation;
import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
public class ObjectLiteralValuePairEmitter extends JSSubEmitter implements
@@ -42,15 +41,7 @@ public class ObjectLiteralValuePairEmitter extends JSSubEmitter implements
ISourceLocation sourceLocationNode = (ISourceLocation) node;
IExpressionNode nameNode = node.getNameNode();
- if (!(nameNode instanceof ILiteralNode))
- {
- startMapping(nameNode);
- }
- getWalker().walk(node.getNameNode());
- if (!(nameNode instanceof ILiteralNode))
- {
- endMapping(nameNode);
- }
+ getWalker().walk(nameNode);
startMapping(sourceLocationNode, nameNode);
write(ASEmitterTokens.COLON);