You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/10/11 05:24:36 UTC
groovy git commit: GROOVY-8835: AstNodeToScriptVisitor - no operation
token needed in the case of an EmptyStatement
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 88908993f -> 4b1a3ee61
GROOVY-8835: AstNodeToScriptVisitor - no operation token needed in the case of an EmptyStatement
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4b1a3ee6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4b1a3ee6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4b1a3ee6
Branch: refs/heads/GROOVY_2_5_X
Commit: 4b1a3ee615c49104d744e431183a6803ce2eed14
Parents: 8890899
Author: Paul King <pa...@asert.com.au>
Authored: Thu Oct 11 15:24:25 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Oct 11 15:24:25 2018 +1000
----------------------------------------------------------------------
.../groovy/inspect/swingui/AstNodeToScriptAdapter.groovy | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/4b1a3ee6/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
index a0d0259..849bfb2 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
@@ -97,6 +97,7 @@ import org.codehaus.groovy.control.CompilationUnit.PrimaryClassNodeOperation
import org.codehaus.groovy.control.CompilePhase
import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.control.SourceUnit
+import org.codehaus.groovy.syntax.Types
import java.lang.reflect.Modifier
import java.security.CodeSource
@@ -734,11 +735,13 @@ class AstNodeToScriptVisitor extends PrimaryClassNodeOperation implements Groovy
@Override
void visitBinaryExpression(BinaryExpression expression) {
expression?.leftExpression?.visit this
- print " $expression.operation.text "
- expression.rightExpression.visit this
+ if (!(expression.rightExpression instanceof EmptyExpression) || expression.operation.type != Types.ASSIGN) {
+ print " $expression.operation.text "
+ expression.rightExpression.visit this
- if (expression?.operation?.text == '[') {
- print ']'
+ if (expression?.operation?.text == '[') {
+ print ']'
+ }
}
}