You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/06/24 08:46:16 UTC
[2/2] git commit: [flex-falcon] [refs/heads/initializers] - add
config option to ignore initialisers
add config option to ignore initialisers
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b805d6d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b805d6d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b805d6d9
Branch: refs/heads/initializers
Commit: b805d6d995b33a96f074d06ec020938ad1956eb2
Parents: 62d53ed
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Jun 23 09:36:20 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Jun 23 09:36:20 2017 +1000
----------------------------------------------------------------------
.../codegen/js/jx/VarDeclarationEmitter.java | 17 ++++++++---------
.../apache/flex/compiler/config/Configuration.java | 5 ++---
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b805d6d9/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
index a4c8e22..3b883c8 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
@@ -42,16 +42,15 @@ import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
public class VarDeclarationEmitter extends JSSubEmitter implements
- ISubEmitter<IVariableNode>
-{
- boolean ignoreInitilization;
+ ISubEmitter<IVariableNode> {
- public VarDeclarationEmitter(IJSEmitter emitter)
- {
+ public VarDeclarationEmitter(IJSEmitter emitter) {
super(emitter);
+ }
+ protected boolean defaultInitialisation() {
JSConfiguration configuration = ((FlexJSProject) getProject()).config;
- ignoreInitilization = configuration.getIgnoreDefaultInitilization();
+ return configuration == null || !configuration.getIgnoreDefaultInitilization();
}
@Override
@@ -196,8 +195,8 @@ public class VarDeclarationEmitter extends JSSubEmitter implements
writeToken(ASEmitterTokens.EQUAL);
write("0");
}
- } else if (!ignoreInitilization) {
- if (ignoreInitilization && defName.equals("Boolean")) {
+ } else if (defaultInitialisation()) {
+ if (defName.equals("Boolean")) {
if (node.getParent() != null &&
node.getParent().getParent() != null &&
node.getParent().getParent().getNodeID() != ASTNodeID.Op_InID) {
@@ -205,7 +204,7 @@ public class VarDeclarationEmitter extends JSSubEmitter implements
writeToken(ASEmitterTokens.EQUAL);
write(ASEmitterTokens.FALSE);
}
- } else if (ignoreInitilization && defName.equals("Number")) {
+ } else if (defName.equals("Number")) {
if (node.getParent() != null &&
node.getParent().getParent() != null &&
node.getParent().getParent().getNodeID() != ASTNodeID.Op_InID) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b805d6d9/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
index e21ef65..64ff7c9 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
@@ -3966,9 +3966,9 @@ public class Configuration
/**
* Allow the user to set Boolean and Number type to be undefined and ignore them being initialised
- * to false and NaN respectively. Note that use this option breaks compatability with ActionScript.
+ * to false and NaN respectively. Note that using this option breaks compatability with ActionScript.
*/
- private boolean ignoreDefaultInitilization = true;
+ private boolean ignoreDefaultInitilization = false;
public boolean getIgnoreDefaultInitilization()
{
@@ -3977,7 +3977,6 @@ public class Configuration
@Config(advanced = true)
@Mapping({ "compiler", "ignore-default-initilization" })
- @FlexOnly
public void setIgnoreDefaultInitilization(ConfigurationValue cv, boolean ignoreDefaultInitilization)
{
this.ignoreDefaultInitilization = ignoreDefaultInitilization;