You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2015/10/07 21:26:43 UTC

[23/37] incubator-groovy git commit: ASTMatcher: Add support for while loop

ASTMatcher: Add support for while loop


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/5a01b997
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/5a01b997
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/5a01b997

Branch: refs/heads/master
Commit: 5a01b997436e9191b8038a7a7e4e3f428b6da636
Parents: 199187e
Author: Cedric Champeau <ce...@gmail.com>
Authored: Fri Oct 17 13:51:17 2014 +0200
Committer: Sergei Egorov <bs...@gmail.com>
Committed: Mon Sep 28 14:33:11 2015 +0300

----------------------------------------------------------------------
 .../groovy/macro/matcher/ASTMatcher.groovy         | 17 +++++++++++++++++
 .../groovy/macro/matcher/ASTMatcherTest.groovy     | 15 +++++++++++++++
 2 files changed, 32 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/5a01b997/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
index 7c3b68f..5deb80b 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.ast.stmt.ExpressionStatement
 import org.codehaus.groovy.ast.stmt.ForStatement
 import org.codehaus.groovy.ast.stmt.IfStatement
 import org.codehaus.groovy.ast.stmt.Statement
+import org.codehaus.groovy.ast.stmt.WhileStatement
 import org.codehaus.groovy.classgen.BytecodeExpression
 import org.codehaus.groovy.control.SourceUnit
 
@@ -880,4 +881,20 @@ class ASTMatcher extends ClassCodeVisitorSupport {
             }
         }
     }
+
+    @Override
+    void visitWhileLoop(final WhileStatement loop) {
+        doWithNode(WhileStatement, current) {
+            visitStatement(loop)
+            def cur = (WhileStatement) current
+            def bool = loop.booleanExpression
+            def block = loop.loopBlock
+            doWithNode(bool.class, cur.booleanExpression) {
+                bool.visit(this)
+            }
+            doWithNode(block.class, cur.loopBlock) {
+                block.visit(this)
+            }
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/5a01b997/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/matcher/ASTMatcherTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/matcher/ASTMatcherTest.groovy b/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/matcher/ASTMatcherTest.groovy
index 75ca21c..78ec60d 100644
--- a/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/matcher/ASTMatcherTest.groovy
+++ b/subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/matcher/ASTMatcherTest.groovy
@@ -28,6 +28,7 @@ import org.codehaus.groovy.ast.expr.UnaryMinusExpression
 import org.codehaus.groovy.ast.expr.UnaryPlusExpression
 import org.codehaus.groovy.ast.stmt.ForStatement
 import org.codehaus.groovy.ast.stmt.IfStatement
+import org.codehaus.groovy.ast.stmt.WhileStatement
 import org.codehaus.groovy.control.CompilePhase
 import org.codehaus.groovy.macro.transform.MacroClass
 
@@ -555,4 +556,18 @@ class ASTMatcherTest extends GroovyTestCase {
         assert !ASTMatcher.matches(ast3, ast5)
         assert !ASTMatcher.matches(ast3, ast6)
     }
+
+    void testWhileLoop() {
+        def ast1 = macro { while (true) {} }
+        def ast2 = macro { while (true) {} }
+        def ast3 = macro { while (false) {} }
+        def ast4 = macro { while (true) { a } }
+
+        assert ast1 instanceof WhileStatement
+        assert ASTMatcher.matches(ast1, ast1)
+        assert ASTMatcher.matches(ast1, ast2)
+        assert ASTMatcher.matches(ast2, ast1)
+        assert !ASTMatcher.matches(ast1, ast3)
+        assert !ASTMatcher.matches(ast1, ast4)
+    }
 }