You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by ke...@apache.org on 2015/08/27 15:43:00 UTC
incubator-groovy git commit: added missing keywords to documentation
Repository: incubator-groovy
Updated Branches:
refs/heads/master c9ec62fce -> a29789714
added missing keywords to documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/a2978971
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/a2978971
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/a2978971
Branch: refs/heads/master
Commit: a2978971402e63168c7ec1f6e5c26df6e7398686
Parents: c9ec62f
Author: Keegan Witt <ke...@gmail.com>
Authored: Thu Aug 27 09:42:45 2015 -0400
Committer: Keegan Witt <ke...@gmail.com>
Committed: Thu Aug 27 09:42:45 2015 -0400
----------------------------------------------------------------------
src/main/org/codehaus/groovy/antlr/groovy.g | 2 +-
src/spec/doc/core-differences-java.adoc | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a2978971/src/main/org/codehaus/groovy/antlr/groovy.g
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/antlr/groovy.g b/src/main/org/codehaus/groovy/antlr/groovy.g
index 3512399..a6ae125 100644
--- a/src/main/org/codehaus/groovy/antlr/groovy.g
+++ b/src/main/org/codehaus/groovy/antlr/groovy.g
@@ -2489,7 +2489,7 @@ namePart {Token first = LT(1);}
/*
* Allowed keywords after dot (as a member name) and before colon (as a label).
- * Includes all Java keywords plus "in" and "as".
+ * Includes all Java keywords plus "as", "def", "in", and "trait".
*/
keywordPropertyNames
: (
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a2978971/src/spec/doc/core-differences-java.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-differences-java.adoc b/src/spec/doc/core-differences-java.adoc
index 712c364..d0cbf0c 100644
--- a/src/spec/doc/core-differences-java.adoc
+++ b/src/spec/doc/core-differences-java.adoc
@@ -273,5 +273,7 @@ Groovy `==` translates to `a.compareTo(b)==0`, iff they are `Comparable`, and
There are a few more keywords in Groovy than in Java. Don't use them for
variable names etc.
-* `in`
-* `trait`
+* `as`
+* `def`
+* `in`
+* `trait`