You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/07/05 00:30:28 UTC

groovy git commit: Stop supporting qualifying path expression with `def` for the time being

Repository: groovy
Updated Branches:
  refs/heads/master 9677e936f -> ce7e5a754


Stop supporting qualifying path expression with `def` for the time being

The enhanced command expression introduces ambiguities, we should resolve them later.

http://ci.groovy-lang.org/viewLog.html?buildId=51095&tab=buildResultsDiv&buildTypeId=Groovy_Jdk8Build_PlusSnapshotDeploy&guest=1


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

Branch: refs/heads/master
Commit: ce7e5a754115ce6d7791763c862ef8061bbb8dd7
Parents: 9677e93
Author: sunlan <su...@apache.org>
Authored: Thu Jul 5 08:30:17 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Thu Jul 5 08:30:17 2018 +0800

----------------------------------------------------------------------
 src/antlr/GroovyParser.g4                                          | 2 +-
 .../parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/ce7e5a75/src/antlr/GroovyParser.g4
----------------------------------------------------------------------
diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4
index e420c15..f2a3e2f 100644
--- a/src/antlr/GroovyParser.g4
+++ b/src/antlr/GroovyParser.g4
@@ -1146,7 +1146,7 @@ identifier
         { DOT == _input.LT(2).getType() }?
         STATIC
     |   IN
-    |   DEF
+//    |   DEF
     |   TRAIT
     |   AS
     ;

http://git-wip-us.apache.org/repos/asf/groovy/blob/ce7e5a75/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy
index ac4e3ae..dd55c2c 100644
--- a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy
@@ -26,7 +26,7 @@ def delegate = new Object() {
 
 delegate.with {
     in.foo
-    def.foo
+//    def.foo
     trait.foo
     as.foo
 }