You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/05/05 22:00:08 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - report error
if binding isn't well-defined
Repository: flex-falcon
Updated Branches:
refs/heads/develop 91463d042 -> 2d716fabf
report error if binding isn't well-defined
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d8a71113
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d8a71113
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d8a71113
Branch: refs/heads/develop
Commit: d8a711132368892312af604311d2679c28d541be
Parents: 91463d0
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 5 07:38:53 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 5 07:38:53 2015 -0700
----------------------------------------------------------------------
.../internal/codegen/databinding/WatcherAnalyzer.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d8a71113/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
index c4316c1..666efe6 100644
--- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
+++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
@@ -23,6 +23,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.apache.flex.compiler.constants.IASKeywordConstants;
+import org.apache.flex.compiler.constants.IASLanguageConstants;
import org.apache.flex.compiler.definitions.IClassDefinition;
import org.apache.flex.compiler.definitions.IConstantDefinition;
import org.apache.flex.compiler.definitions.IDefinition;
@@ -33,6 +35,7 @@ import org.apache.flex.compiler.definitions.IVariableDefinition;
import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType;
import org.apache.flex.compiler.internal.projects.FlexProject;
import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
+import org.apache.flex.compiler.problems.AccessUndefinedPropertyProblem;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -265,7 +268,8 @@ public class WatcherAnalyzer
IDefinition def = node.resolve(project);
if ((def == null) && !state.isObjectProxyExpression)
{
- return; // this is not "defensive programming"!
+ if (node.getName() == IASKeywordConstants.THIS)
+ return; // this is not "defensive programming"!
// we fully expect to get non-resolvable identifiers in some cases:
// a) bad code.
// b) "this"
@@ -275,6 +279,8 @@ public class WatcherAnalyzer
// may very well be a dynamic property with no definition,
// so will will continue on (with the knowledge that we have no
// IDefinition
+ this.problems.add(new AccessUndefinedPropertyProblem(node, node.getName()));
+ return;
}
if (def instanceof IConstantDefinition)
[2/3] git commit: [flex-falcon] [refs/heads/develop] - change to a
wwarning
Posted by ah...@apache.org.
change to a wwarning
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bfe2c8e0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bfe2c8e0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bfe2c8e0
Branch: refs/heads/develop
Commit: bfe2c8e0aa50872d1de670d9029d9d5e76e1e3d9
Parents: d8a7111
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 5 12:59:23 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 5 12:59:23 2015 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/databinding/WatcherAnalyzer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bfe2c8e0/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
index 666efe6..35471f2 100644
--- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
+++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/WatcherAnalyzer.java
@@ -35,8 +35,8 @@ import org.apache.flex.compiler.definitions.IVariableDefinition;
import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType;
import org.apache.flex.compiler.internal.projects.FlexProject;
import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.problems.AccessUndefinedPropertyProblem;
import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.flex.compiler.problems.MXMLDatabindingSourceNotBindableProblem;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IASNode;
@@ -279,7 +279,7 @@ public class WatcherAnalyzer
// may very well be a dynamic property with no definition,
// so will will continue on (with the knowledge that we have no
// IDefinition
- this.problems.add(new AccessUndefinedPropertyProblem(node, node.getName()));
+ this.problems.add(new MXMLDatabindingSourceNotBindableProblem(node, node.getName()));
return;
}
[3/3] git commit: [flex-falcon] [refs/heads/develop] - fx:Components
were messing up the sameClass test
Posted by ah...@apache.org.
fx:Components were messing up the sameClass test
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2d716fab
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2d716fab
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2d716fab
Branch: refs/heads/develop
Commit: 2d716fabf94a92e9b4e7a327bf9379208f234f25
Parents: bfe2c8e
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 5 13:00:00 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 5 13:00:00 2015 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d716fab/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 789fb2c..f7d9c55 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -267,6 +267,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
classDefinition = cdef;
IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker())
.getASEmitter();
+ IDefinition oldThisClass = ((JSFlexJSEmitter) asEmitter).thisClass;
((JSFlexJSEmitter) asEmitter).thisClass = cdef;
IASNode classNode = node.getContainedClassDefinitionNode();
@@ -311,6 +312,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
idCounter = oldIdCounter;
inMXMLContent = oldInMXMLContent;
classDefinition = oldClassDef;
+ ((JSFlexJSEmitter) asEmitter).thisClass = oldThisClass;
}