You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/21 09:51:09 UTC

[1/4] incubator-groovy git commit: operator precedence doco didn't match grammar in a few spots plus some missing operators

Repository: incubator-groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X f1ea63385 -> 871f49579


operator precedence doco didn't match grammar in a few spots plus some missing operators


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 9857ebb38284a3a51b30576071d535105ed91b95
Parents: f1ea633
Author: Paul King <pa...@asert.com.au>
Authored: Mon May 18 10:52:12 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:50:50 2015 +1000

----------------------------------------------------------------------
 src/spec/doc/core-operators.adoc | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9857ebb3/src/spec/doc/core-operators.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-operators.adoc b/src/spec/doc/core-operators.adoc
index 30d26b4..2492aaa 100644
--- a/src/spec/doc/core-operators.adoc
+++ b/src/spec/doc/core-operators.adoc
@@ -648,24 +648,27 @@ The table below lists all groovy operators in order of precedence.
 [options="header"]
 |======================
 |Level | Operator(s) | Name(s)
-| 1 | `$x` | scope escape
-|   | `new` `()` | new, explicit parentheses
-|   | `()` `{}` `[]` | method call, closure, list/map
-|   | `.` `?.` `*.` | dot, safe dereferencing, spread-dot
-|   | `~` `!$` `(type)` | bitwise negate, not, typecast
+| 1 | `new` `()` | object creation, explicit parentheses
+|   | `()` `{}` `[]` | method call, closure, literal list/map
+|   | `.` `.&` `.@` | member access, method closure, field/attribute access
+|   | `?.` `*` `*.` `*:` | safe dereferencing, spread, spread-dot, spread-map
+|   | `~` `!` `(type)` | bitwise negate/pattern, not, typecast
+|   | [] ++ -- | list/map/array index, post inc/decrement
 | 2 | `**` | power
-| 3 | `++` `--` `+` `-` | pre/post increment/decrement, unary plus, unary minus
+| 3 | `++` `--` `+` `-` | pre inc/decrement, unary plus, unary minus
 | 4 | `*` `/` `%` | multiply, div, modulo
-| 5 | `+` `-` | binary plus, binary minus
+| 5 | `+` `-` | addition, subtraction
 | 6 | `<<` `>>` `>>>` `..` `..<` | left/right (unsigned) shift, inclusive/exclusive range
-| 7 | `<` `\<=` `>` `>=` `instanceof` `as` | less/greater than/or equal, instanceof, type coercion
-| 8 | `==` `!=` `pass:[<=>]` | equal, not equal, compare to
-| 9 | `&` | binary and
-| 10 | `^` | binary xor
-| 11 | `\|` | binary or
+| 7 | `<` `\<=` `>` `>=` `in` `instanceof` `as` | less/greater than/or equal, in, instanceof, type coercion
+| 8 | `==` `!=` `pass:[<=>]` | equals, not equals, compare to
+|   | `=~` `==~` | regex find, regex match
+| 9 | `&` | binary/bitwise and
+| 10 | `^` | binary/bitwise xor
+| 11 | `\|` | binary/bitwise or
 | 12 | `&&` | logical and
 | 13 | `\|\|` | logical or
-| 14 | `?:` | ternary conditional
+| 14 | `? :` | ternary conditional
+|    | `?:` | elvis operator
 | 15 | `=` `\**=` `*=` `/=` `%=` `+=` `-=` `pass:[<<=]` `>>=` `>>>=` `&=` `^=` `\|=` | various assignments
 |======================

[4/4] incubator-groovy git commit: tweak gradle classpath for docGDK

Posted by pa...@apache.org.
tweak gradle classpath for docGDK


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 871f4957948e3a8ccba287ed9678194eecde244a
Parents: 0327b62
Author: Paul King <pa...@asert.com.au>
Authored: Tue May 19 23:27:05 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:50:52 2015 +1000

----------------------------------------------------------------------
 build.gradle       | 2 +-
 gradle/docs.gradle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/871f4957/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6298c53..a6046aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -272,7 +272,7 @@ sourceSets {
         }
     }
     tools {
-        compileClasspath = configurations.tools + sourceSets.main.runtimeClasspath
+        compileClasspath = sourceSets.main.runtimeClasspath + configurations.tools
         runtimeClasspath = output + compileClasspath
     }
     examples {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/871f4957/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index f7f84e3..f5f3abb 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -128,7 +128,7 @@ task docGDK {
     }
     dependsOn docProjectVersionInfo
     ext.destinationDir = "$buildDir/html/groovy-jdk"
-    inputs.files sourceSets.tools.runtimeClasspath
+    inputs.files sourceSets.main.runtimeClasspath + configurations.tools
     outputs.dir destinationDir
     doLast { task ->
         try {
@@ -136,7 +136,7 @@ task docGDK {
                 java(classname: 'org.codehaus.groovy.tools.DocGenerator',
                      fork: 'true',
                      failonerror: 'true',
-                     classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath,
+                     classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath).asPath,
                      errorproperty: 'edr',
                      outputproperty: 'odr') {
                     arg(value: '-title')

[2/4] incubator-groovy git commit: operator precedence doco (make a little bit prettier)

Posted by pa...@apache.org.
operator precedence doco (make a little bit prettier)


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 5e7de1091de18ebc5fbb3a6730c33ffa407dc5dc
Parents: 9857ebb
Author: Paul King <pa...@asert.com.au>
Authored: Mon May 18 12:02:06 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:50:51 2015 +1000

----------------------------------------------------------------------
 src/spec/doc/core-operators.adoc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/5e7de109/src/spec/doc/core-operators.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-operators.adoc b/src/spec/doc/core-operators.adoc
index 2492aaa..be1b17b 100644
--- a/src/spec/doc/core-operators.adoc
+++ b/src/spec/doc/core-operators.adoc
@@ -648,20 +648,20 @@ The table below lists all groovy operators in order of precedence.
 [options="header"]
 |======================
 |Level | Operator(s) | Name(s)
-| 1 | `new` `()` | object creation, explicit parentheses
-|   | `()` `{}` `[]` | method call, closure, literal list/map
-|   | `.` `.&` `.@` | member access, method closure, field/attribute access
-|   | `?.` `*` `*.` `*:` | safe dereferencing, spread, spread-dot, spread-map
-|   | `~` `!` `(type)` | bitwise negate/pattern, not, typecast
-|   | [] ++ -- | list/map/array index, post inc/decrement
+| 1 | `new` &#160; `()` | object creation, explicit parentheses
+|   | `()` &#160; `{}` &#160; `[]` | method call, closure, literal list/map
+|   | `.` &#160; `.&` &#160; `.@` | member access, method closure, field/attribute access
+|   | `?.` &#160; `\*` &#160; `*.` &#160; `*:` | safe dereferencing, spread, spread-dot, spread-map
+|   | `~` &#160; `!` &#160; `(type)` | bitwise negate/pattern, not, typecast
+|   | `[]` &#160; `++` &#160; `--` | list/map/array index, post inc/decrement
 | 2 | `**` | power
-| 3 | `++` `--` `+` `-` | pre inc/decrement, unary plus, unary minus
-| 4 | `*` `/` `%` | multiply, div, modulo
-| 5 | `+` `-` | addition, subtraction
-| 6 | `<<` `>>` `>>>` `..` `..<` | left/right (unsigned) shift, inclusive/exclusive range
-| 7 | `<` `\<=` `>` `>=` `in` `instanceof` `as` | less/greater than/or equal, in, instanceof, type coercion
-| 8 | `==` `!=` `pass:[<=>]` | equals, not equals, compare to
-|   | `=~` `==~` | regex find, regex match
+| 3 | `++` &#160; `--` &#160; `+` &#160; `-` | pre inc/decrement, unary plus, unary minus
+| 4 | `*` &#160; `/` &#160; `%` | multiply, div, modulo
+| 5 | `+` &#160; `-` | addition, subtraction
+| 6 | `<<` &#160; `>>` &#160; `>>>` &#160; `..` &#160; `..<` | left/right (unsigned) shift, inclusive/exclusive range
+| 7 | `<` &#160; `\<=` &#160; `>` &#160; `>=` &#160; `in` &#160; `instanceof` &#160; `as` | less/greater than/or equal, in, instanceof, type coercion
+| 8 | `==` &#160; `!=` &#160; `pass:[<=>]` | equals, not equals, compare to
+|   | `=~` &#160; `==~` | regex find, regex match
 | 9 | `&` | binary/bitwise and
 | 10 | `^` | binary/bitwise xor
 | 11 | `\|` | binary/bitwise or
@@ -669,7 +669,7 @@ The table below lists all groovy operators in order of precedence.
 | 13 | `\|\|` | logical or
 | 14 | `? :` | ternary conditional
 |    | `?:` | elvis operator
-| 15 | `=` `\**=` `*=` `/=` `%=` `+=` `-=` `pass:[<<=]` `>>=` `>>>=` `&=` `^=` `\|=` | various assignments
+| 15 | `=` &#160; `\**=` &#160; `*=` &#160; `/=` &#160; `%=` &#160; `+=` &#160; `-=` &#160; `pass:[<<=]` &#160; `>>=` &#160; `>>>=` &#160; `&=` &#160; `^=` &#160; `\|=` | various assignments
 |======================
 
 [[Operator-Overloading]]

Re: [1/4] incubator-groovy git commit: operator precedence doco didn't match grammar in a few spots plus some missing operators

Posted by Cary Chapman <ca...@gmail.com>.
unsubscribe me.

On Thu, May 21, 2015 at 1:51 AM, <pa...@apache.org> wrote:

> Repository: incubator-groovy
> Updated Branches:
>   refs/heads/GROOVY_2_4_X f1ea63385 -> 871f49579
>
>
> operator precedence doco didn't match grammar in a few spots plus some
> missing operators
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/9857ebb3
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/9857ebb3
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/9857ebb3
>
> Branch: refs/heads/GROOVY_2_4_X
> Commit: 9857ebb38284a3a51b30576071d535105ed91b95
> Parents: f1ea633
> Author: Paul King <pa...@asert.com.au>
> Authored: Mon May 18 10:52:12 2015 +1000
> Committer: Paul King <pa...@asert.com.au>
> Committed: Thu May 21 17:50:50 2015 +1000
>
> ----------------------------------------------------------------------
>  src/spec/doc/core-operators.adoc | 29 ++++++++++++++++-------------
>  1 file changed, 16 insertions(+), 13 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/9857ebb3/src/spec/doc/core-operators.adoc
> ----------------------------------------------------------------------
> diff --git a/src/spec/doc/core-operators.adoc
> b/src/spec/doc/core-operators.adoc
> index 30d26b4..2492aaa 100644
> --- a/src/spec/doc/core-operators.adoc
> +++ b/src/spec/doc/core-operators.adoc
> @@ -648,24 +648,27 @@ The table below lists all groovy operators in order
> of precedence.
>  [options="header"]
>  |======================
>  |Level | Operator(s) | Name(s)
> -| 1 | `$x` | scope escape
> -|   | `new` `()` | new, explicit parentheses
> -|   | `()` `{}` `[]` | method call, closure, list/map
> -|   | `.` `?.` `*.` | dot, safe dereferencing, spread-dot
> -|   | `~` `!$` `(type)` | bitwise negate, not, typecast
> +| 1 | `new` `()` | object creation, explicit parentheses
> +|   | `()` `{}` `[]` | method call, closure, literal list/map
> +|   | `.` `.&` `.@` | member access, method closure, field/attribute
> access
> +|   | `?.` `*` `*.` `*:` | safe dereferencing, spread, spread-dot,
> spread-map
> +|   | `~` `!` `(type)` | bitwise negate/pattern, not, typecast
> +|   | [] ++ -- | list/map/array index, post inc/decrement
>  | 2 | `**` | power
> -| 3 | `++` `--` `+` `-` | pre/post increment/decrement, unary plus, unary
> minus
> +| 3 | `++` `--` `+` `-` | pre inc/decrement, unary plus, unary minus
>  | 4 | `*` `/` `%` | multiply, div, modulo
> -| 5 | `+` `-` | binary plus, binary minus
> +| 5 | `+` `-` | addition, subtraction
>  | 6 | `<<` `>>` `>>>` `..` `..<` | left/right (unsigned) shift,
> inclusive/exclusive range
> -| 7 | `<` `\<=` `>` `>=` `instanceof` `as` | less/greater than/or equal,
> instanceof, type coercion
> -| 8 | `==` `!=` `pass:[<=>]` | equal, not equal, compare to
> -| 9 | `&` | binary and
> -| 10 | `^` | binary xor
> -| 11 | `\|` | binary or
> +| 7 | `<` `\<=` `>` `>=` `in` `instanceof` `as` | less/greater than/or
> equal, in, instanceof, type coercion
> +| 8 | `==` `!=` `pass:[<=>]` | equals, not equals, compare to
> +|   | `=~` `==~` | regex find, regex match
> +| 9 | `&` | binary/bitwise and
> +| 10 | `^` | binary/bitwise xor
> +| 11 | `\|` | binary/bitwise or
>  | 12 | `&&` | logical and
>  | 13 | `\|\|` | logical or
> -| 14 | `?:` | ternary conditional
> +| 14 | `? :` | ternary conditional
> +|    | `?:` | elvis operator
>  | 15 | `=` `\**=` `*=` `/=` `%=` `+=` `-=` `pass:[<<=]` `>>=` `>>>=` `&=`
> `^=` `\|=` | various assignments
>  |======================
>
>
>

[3/4] incubator-groovy git commit: operator precedence doco (make a little bit prettier)

Posted by pa...@apache.org.
operator precedence doco (make a little bit prettier)


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 0327b62bb040d7d9a752920ffcf57f0d3111fec4
Parents: 5e7de10
Author: Paul King <pa...@asert.com.au>
Authored: Mon May 18 12:04:50 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:50:51 2015 +1000

----------------------------------------------------------------------
 src/spec/doc/core-operators.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/0327b62b/src/spec/doc/core-operators.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-operators.adoc b/src/spec/doc/core-operators.adoc
index be1b17b..1bf7ea3 100644
--- a/src/spec/doc/core-operators.adoc
+++ b/src/spec/doc/core-operators.adoc
@@ -669,7 +669,8 @@ The table below lists all groovy operators in order of precedence.
 | 13 | `\|\|` | logical or
 | 14 | `? :` | ternary conditional
 |    | `?:` | elvis operator
-| 15 | `=` &#160; `\**=` &#160; `*=` &#160; `/=` &#160; `%=` &#160; `+=` &#160; `-=` &#160; `pass:[<<=]` &#160; `>>=` &#160; `>>>=` &#160; `&=` &#160; `^=` &#160; `\|=` | various assignments
+| 15 | `=` &#160; `\**=` &#160; `*=` &#160; `/=` &#160; `%=` &#160; `+=` &#160; `-=` &#160; +
+`pass:[<<=]` &#160; `>>=` &#160; `>>>=` &#160; `&=` &#160; `^=` &#160; `\|=` | various assignments
 |======================
 
 [[Operator-Overloading]]