get line number info for unknown config vars
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/783e8b19 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/783e8b19 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/783e8b19 Branch: refs/heads/develop Commit: 783e8b19b735e7770397e00f2491d5f65355aeaf Parents: 0f179d9 Author: Alex Harui <[email protected]> Authored: Mon Oct 5 08:57:23 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Mon Oct 5 08:57:23 2015 -0700 ---------------------------------------------------------------------- .../org/apache/flex/compiler/internal/parsing/as/ASParser.g | 4 ++-- .../flex/compiler/internal/parsing/as/BaseASParser.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/783e8b19/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 5f54d81..32e0135 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 @@ -275,7 +275,7 @@ configCondition returns [boolean result] } : ns:TOKEN_NAMESPACE_NAME op:TOKEN_OPERATOR_NS_QUALIFIER id:TOKEN_IDENTIFIER { - result = evaluateConfigurationVariable(ns.getText(), (ASToken) op, id.getText()); + result = evaluateConfigurationVariable(new NamespaceIdentifierNode((ASToken)ns), (ASToken) op, new IdentifierNode((ASToken)id)); } ; @@ -290,7 +290,7 @@ configConditionOfDefinition returns [boolean result] } : ns:TOKEN_NAMESPACE_NAME op:TOKEN_OPERATOR_NS_QUALIFIER id:TOKEN_NAMESPACE_ANNOTATION { - result = evaluateConfigurationVariable(ns.getText(), (ASToken) op, id.getText()); + result = evaluateConfigurationVariable(new NamespaceIdentifierNode((ASToken)ns), (ASToken) op, new IdentifierNode((ASToken)id)); } ; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/783e8b19/compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java b/compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java index 1d26445..fb57848 100644 --- a/compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java +++ b/compiler/src/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java @@ -2396,14 +2396,14 @@ abstract class BaseASParser extends LLkParser implements IProblemReporter * @return True if the qualified configuration variable evaluates to true. */ protected boolean evaluateConfigurationVariable( - final String configNamespace, + final IdentifierNode configNamespace, final ASToken opToken, - final String configVar) + final IdentifierNode configVar) { final ConfigExpressionNode configExpression = new ConfigExpressionNode( - new NamespaceIdentifierNode(configNamespace), + configNamespace, opToken, - new IdentifierNode(configVar)); + configVar); final Object value = configProcessor.evaluateConstNodeExpressionToJavaObject(configExpression); return value == null ? false : ECMASupport.toBoolean(value);
