[groovy] branch master updated: Trivial refactoring for GINQ macro methods

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new c7e9df4  Trivial refactoring for GINQ macro methods
c7e9df4 is described below

commit c7e9df4dd2ab4afedcadbb60ad04b0926e69625c
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jul 25 11:01:45 2021 +0800

    Trivial refactoring for GINQ macro methods
---
 .../src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
index 5a564ac..5517bbb 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
@@ -70,7 +70,7 @@ class GinqGroovyMethods {
      */
     @Macro
     static Expression GQL(final MacroContext ctx, final ClosureExpression ginqClosureExpression) {
-        callX(GQ(ctx, ginqClosureExpression), 'toList')
+        GQL(ctx, null, ginqClosureExpression)
     }
 
     /**
@@ -84,7 +84,7 @@ class GinqGroovyMethods {
      */
     @Macro
     static Expression GQ(final MacroContext ctx, final MapExpression ginqConfigurationMapExpression, final ClosureExpression ginqClosureExpression) {
-        return transformGinqCode(ctx.sourceUnit, ginqConfigurationMapExpression, ginqClosureExpression.code)
+        transformGinqCode(ctx.sourceUnit, ginqConfigurationMapExpression, ginqClosureExpression.code)
     }
 
     /**