groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [44/50] groovy git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/groovy into parrot
Date Tue, 11 Apr 2017 01:38:20 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/groovy into parrot

# Conflicts:
#	.travis.yml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
#	src/test/groovy/EqualsTest.groovy
#	subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/runtime/MacroBuilder.java
#	subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroInvocationTrap.java
#	subprojects/groovy-macro/src/test/groovy/org/codehaus/groovy/macro/MacroTest.groovy


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

Branch: refs/heads/master
Commit: 921fa3d90e2557bcf5a21d2be4886b0a7f0a2c35
Parents: 3b1a720 fb1f14a
Author: sunlan <sunlan@apache.org>
Authored: Fri Apr 7 21:30:13 2017 +0800
Committer: sunlan <sunlan@apache.org>
Committed: Fri Apr 7 21:30:30 2017 +0800

----------------------------------------------------------------------
 build.gradle                                    |  10 +-
 gradle.properties                               |   4 +-
 gradle/assemble.gradle                          |  52 ++-
 gradle/wrapper/gradle-wrapper.jar               | Bin 54208 -> 54227 bytes
 gradle/wrapper/gradle-wrapper.properties        |   5 +-
 security/groovy.policy                          |   2 +
 settings.gradle                                 |   4 +
 .../beans/ListenerListASTTransformation.groovy  |   3 +-
 src/main/groovy/lang/MetaClassImpl.java         |   5 -
 src/main/groovy/transform/BaseScript.java       |   2 +-
 src/main/groovy/transform/MapConstructor.java   |   4 +-
 src/main/groovy/transform/TupleConstructor.java |   4 +-
 .../transform/builder/DefaultStrategy.java      |   8 +-
 src/main/groovy/util/NodeList.java              |   3 +-
 src/main/org/codehaus/groovy/ast/ClassNode.java |   3 +-
 .../groovy/ast/TransformingCodeVisitor.java     | 340 ++++++++++++++++++
 .../org/codehaus/groovy/ast/VariableScope.java  |  17 +-
 .../codehaus/groovy/ast/tools/GeneralUtils.java |   4 +-
 .../classgen/ClassCompletionVerifier.java       |  44 ++-
 .../groovy/classgen/asm/CompileStack.java       |  17 +-
 .../classgen/asm/OptimizingStatementWriter.java |  18 +-
 .../codehaus/groovy/control/ErrorCollector.java |   6 +-
 .../org/codehaus/groovy/control/SourceUnit.java |   4 +
 .../codehaus/groovy/reflection/ClassInfo.java   |  55 ++-
 .../groovy/runtime/DefaultGroovyMethods.java    |  64 +++-
 .../metaclass/MetaClassRegistryImpl.java        |  12 +-
 .../codehaus/groovy/syntax/SyntaxException.java |   5 +
 .../transform/ImmutableASTTransformation.java   |  11 +-
 .../transform/MemoizedASTTransformation.java    |   7 +-
 .../stc/StaticTypeCheckingSupport.java          |   2 +-
 .../stc/StaticTypeCheckingVisitor.java          |  12 +-
 .../trait/SuperCallTraitTransformer.java        |  83 +++--
 .../transform/trait/TraitASTTransformation.java | 104 ++++--
 .../groovy/transform/trait/TraitComposer.java   |  96 +++--
 .../trait/TraitReceiverTransformer.java         |  97 +++--
 .../util/ManagedConcurrentLinkedQueue.java      | 180 ++++++++++
 .../codehaus/groovy/util/ManagedLinkedList.java |   2 +
 src/spec/doc/core-semantics.adoc                |   4 +-
 src/spec/doc/grape.adoc                         |   6 +-
 src/spec/doc/working-with-collections.adoc      |  20 +-
 src/spec/test/ClosuresSpecTest.groovy           |   2 +-
 .../test/gdk/WorkingWithCollectionsTest.groovy  |  20 +-
 src/test/groovy/bugs/Groovy6792Bug.groovy       |  49 +++
 src/test/groovy/bugs/Groovy7248Bug.groovy       |  67 ++++
 src/test/groovy/bugs/Groovy7797Bug.groovy       |  38 ++
 src/test/groovy/bugs/Groovy7909Bug.groovy       |  76 ++++
 src/test/groovy/bugs/Groovy8046Bug.groovy       |  52 +++
 src/test/groovy/bugs/Groovy8048Bug.groovy       |  46 +++
 src/test/groovy/bugs/Groovy8085Bug.groovy       |  91 +++++
 src/test/groovy/bugs/Groovy8110Bug.groovy       |  45 +++
 src/test/groovy/bugs/Groovy8140Bug.groovy       |  48 +++
 src/test/groovy/util/logging/Log4j2Test.groovy  |  36 +-
 .../asm/sc/bugs/ReproducibleBytecodeBugs.groovy |  92 +++++
 .../MemoizedASTTransformationTest.groovy        |  12 +
 .../ManagedConcurrentLinkedQueueTest.groovy     |  88 +++++
 .../groovy/inspect/swingui/AstBrowser.groovy    |  79 ++--
 .../swingui/AstNodeToScriptAdapter.groovy       |  51 ++-
 .../swingui/AstNodeToScriptAdapterTest.groovy   |  92 +++++
 subprojects/groovy-macro/build.gradle           |   2 +-
 .../macro/methods/MacroGroovyMethods.java       | 207 +++++++++++
 .../codehaus/groovy/macro/runtime/Macro.java    |  37 ++
 .../groovy/macro/runtime/MacroBuilder.java      |  22 +-
 .../groovy/macro/runtime/MacroContext.java      |  71 ++++
 .../macro/runtime/MacroGroovyMethods.java       |  53 ---
 .../groovy/macro/runtime/MacroStub.java         |  33 ++
 .../transform/MacroCallTransformingVisitor.java | 156 ++++++++
 .../groovy/macro/transform/MacroClass.java      |   8 +
 .../transform/MacroClassTransformation.java     | 138 +++++++
 .../macro/transform/MacroInvocationTrap.java    | 274 --------------
 .../macro/transform/MacroMethodsCache.java      | 144 ++++++++
 .../macro/transform/MacroTransformation.java    |  34 +-
 .../macro/transform/TransformingMacroTrap.java  | 343 ------------------
 ....codehaus.groovy.transform.ASTTransformation |   1 +
 .../groovy/macro/ExampleMacroMethods.java       |  52 +++
 .../org/codehaus/groovy/macro/MacroTest.groovy  |  24 ++
 .../groovy/macro/MacroTransformationTest.groovy |  70 ++++
 .../groovy/macro/matcher/ASTMatcherTest.groovy  | 357 ++++++++++++++++++-
 .../org.codehaus.groovy.runtime.ExtensionModule |  17 +
 .../src/main/java/groovy/sql/Sql.java           |  27 +-
 .../groovy/groovy/sql/SqlCompleteTest.groovy    |  17 +
 .../main/java/groovy/xml/dom/DOMCategory.java   |   5 +-
 .../groovy-xml/src/spec/doc/xml-userguide.adoc  |   2 +-
 subprojects/stress/README.adoc                  |  40 +++
 subprojects/stress/build.gradle                 |  28 ++
 .../org/apache/groovy/stress/util/GCUtils.java  |  39 ++
 .../apache/groovy/stress/util/ThreadUtils.java  |  43 +++
 .../reflection/ClassInfoDeadlockStressTest.java | 138 +++++++
 .../reflection/ClassInfoLeakStressTest.java     | 101 ++++++
 .../ManagedConcurrentLinkedQueueStressTest.java | 164 +++++++++
 .../util/ManagedConcurrentMapStressTest.java    | 136 +++++++
 .../ManagedConcurrentValueMapStressTest.java    | 135 +++++++
 91 files changed, 4204 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index 2dee7bc,0bcddc9..469048f
--- a/build.gradle
+++ b/build.gradle
@@@ -174,8 -169,7 +174,8 @@@ ext 
      slf4jVersion = '1.7.21'
      xmlunitVersion = '1.6'
      xstreamVersion = '1.4.9'
-     spockVersion = '1.0-groovy-2.4'
+     spockVersion = '1.1-groovy-2.4-SNAPSHOT' // supports 3.0
 +    antlr4Version = '4.6.0.3'
      isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot")
  }
  

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/gradle/assemble.gradle
----------------------------------------------------------------------
diff --cc gradle/assemble.gradle
index acb4540,72ef7f5..ab8c69c
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@@ -191,10 -191,9 +191,10 @@@ allprojects 
                          }
  
                          zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util')
},
-                                 includes: 'org/objectweb/asm/util/Printer.class,org/objectweb/asm/util/Textifier.class,org/objectweb/asm/util/Trace*')
+                                 includes: 'org/objectweb/asm/util/Printer.class,org/objectweb/asm/util/Textifier.class,org/objectweb/asm/util/ASMifier.class,org/objectweb/asm/util/Trace*')
                      }
 -                    rule pattern: 'antlr.**', result: 'groovyjarjarantlr.@1'
 +                    rule pattern: 'antlr.**', result: 'groovyjarjarantlr.@1' // antlr2
 +                    rule pattern: 'org.antlr.**', result: 'groovyjarjarantlr4.@1' // antlr4
                      rule pattern: 'org.objectweb.**', result: 'groovyjarjarasm.@1'
                      rule pattern: 'org.apache.commons.cli.**', result: 'groovyjarjarcommonscli.@1'
                  }

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/src/main/groovy/lang/MetaClassImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/groovy/blob/921fa3d9/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
----------------------------------------------------------------------


Mime
View raw message