Skip to content
Permalink
Browse files

Merge branch 'parrot'

  • Loading branch information...
paulk-asert committed Apr 10, 2017
2 parents e0d5596 + ce12609 commit a3f8671b5fb6ce83a7c3c65c04d46626ddbb646a
Showing with 71,265 additions and 404 deletions.
  1. +1 −0 .gitignore
  2. +1 −2 .travis.yml
  3. +18 −10 build.gradle
  4. +2 −1 gradle/assemble.gradle
  5. +3 −2 gradle/docs.gradle
  6. +22 −0 src/main/groovy/lang/Groovydoc.java
  7. +95 −77 src/main/groovy/lang/MetaClassImpl.java
  8. +32 −32 src/main/groovy/ui/GroovyMain.java
  9. +1,696 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
  10. +40 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/EntryWeigher.java
  11. +48 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/EvictionListener.java
  12. +459 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/LinkedDeque.java
  13. +39 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/Weigher.java
  14. +278 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/Weighers.java
  15. +41 −0 src/main/org/apache/groovy/util/concurrentlinkedhashmap/package-info.java
  16. +18 −2 src/main/org/codehaus/groovy/ast/expr/BinaryExpression.java
  17. +10 −2 src/main/org/codehaus/groovy/ast/expr/DeclarationExpression.java
  18. +47 −0 src/main/org/codehaus/groovy/ast/expr/LambdaExpression.java
  19. +45 −0 src/main/org/codehaus/groovy/ast/expr/MethodReferenceExpression.java
  20. +27 −3 src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
  21. +3 −20 src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
  22. +3 −19 src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java
  23. +113 −22 src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
  24. +14 −12 src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
  25. +9 −14 src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
  26. +9 −11 src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
  27. +33 −21 src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
  28. +1 −1 src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
  29. +2 −2 src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
  30. +7 −4 src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
  31. +11 −5 src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
  32. +17 −1 src/main/org/codehaus/groovy/control/CompilerConfiguration.java
  33. +49 −10 src/main/org/codehaus/groovy/control/ParserPluginFactory.java
  34. +98 −0 src/main/org/codehaus/groovy/runtime/ArrayTypeUtils.java
  35. +3 −3 src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
  36. +71 −12 src/main/org/codehaus/groovy/runtime/MethodClosure.java
  37. +9 −3 src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
  38. +13 −7 src/main/org/codehaus/groovy/runtime/memoize/LRUCache.java
  39. +27 −9 src/main/org/codehaus/groovy/syntax/Types.java
  40. +142 −40 src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
  41. +24 −26 src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
  42. +1 −1 src/spec/test/builder/CliBuilderTest.groovy
  43. +8 −30 src/test/groovy/EqualsTest.groovy
  44. +9 −0 src/test/groovy/EscapedUnicodeTest.groovy
  45. +4 −0 subprojects/groovy-console/build.gradle
  46. +36 −0 subprojects/groovy-parser-antlr4/README.md
  47. +59 −0 subprojects/groovy-parser-antlr4/build.gradle
  48. +872 −0 subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyLexer.g4
  49. +1,250 −0 subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
  50. BIN ...ojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/Java.g4.v20160306.zip
  51. +74 −0 ...ts/groovy-parser-antlr4/src/main/groovy/org/apache/groovy/parser/antlr4/util/GroovyTestRig.groovy
  52. +83 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/AbstractParser.java
  53. +34 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr2Parser.java
  54. +39 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr4Parser.java
  55. +32 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractLexer.java
  56. +32 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractParser.java
  57. +45 −0 ...ojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
  58. +17 −0 ...jects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
  59. +4,494 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
  60. +45 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangLexer.java
  61. +38 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangParser.java
  62. +42 −0 ...rojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovySyntaxError.java
  63. +165 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java
  64. +152 −0 ...ojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
  65. +46 −0 ...cts/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SyntaxErrorReportable.java
  66. +352 −0 ...arser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
  67. +107 −0 ...jects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/AtnManager.java
  68. +110 −0 ...arser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
  69. +149 −0 subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java
  70. +1,684 −0 ...ects/groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Geb10SourcesTest.groovy
  71. +15,941 −0 .../groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Gradle310SourcesTest.groovy
  72. +4,648 −0 .../groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Grails320SourcesTest.groovy
  73. +11,081 −0 .../groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Groovy250ScriptsTest.groovy
  74. +7,427 −0 .../groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Groovy250SourcesTest.groovy
  75. +358 −0 ...ects/groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
  76. +1,224 −0 ...groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/Spock11RC2SourcesTest.groovy
  77. +148 −0 ...jects/groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy
  78. +259 −0 subprojects/groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
  79. +526 −0 ...y-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/ASTComparatorCategory.groovy
  80. +1,025 −0 ...ojects/groovy-parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/AstDumper.groovy
  81. +5 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-2324.groovy
  82. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4438.groovy
  83. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4757.groovy
  84. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4762.groovy
  85. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5318.groovy
  86. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5652.groovy
  87. +19 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/BUG-GROOVY-6038.groovy
  88. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/bugs/GROOVY-3898.groovy
  89. +39 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/AnnotationDeclaration_01.groovy
  90. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_01.groovy
  91. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_02.groovy
  92. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_03.groovy
  93. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_04.groovy
  94. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_05.groovy
  95. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_06.groovy
  96. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_07.groovy
  97. +10 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_08.groovy
  98. +14 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_09.groovy
  99. +20 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Annotation_10x.groovy
  100. +72 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Array_01x.groovy
  101. +28 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Assert_01.groovy
  102. +37 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Assert_02x.groovy
  103. +26 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Assert_03x.groovy
  104. +24 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/BreakingChange_01x.groovy
  105. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/BreakingChange_02x.groovy
  106. +16 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/BreakingChange_03x.groovy
  107. +26 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/BreakingChange_04x.groovy
  108. +55 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_01.groovy
  109. +42 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_02.groovy
  110. +51 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_03.groovy
  111. +22 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_04.groovy
  112. +20 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_05.groovy
  113. +83 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_06.groovy
  114. +27 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ClassDeclaration_07.groovy
  115. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_01.groovy
  116. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_02.groovy
  117. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_03.groovy
  118. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_04.groovy
  119. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_05.groovy
  120. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_06.groovy
  121. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_07.groovy
  122. +16 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_08.groovy
  123. +16 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_09.groovy
  124. +4 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Closure_10.groovy
  125. +24 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/CodeBlock_01x.groovy
  126. +18 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_01.groovy
  127. +11 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_02.groovy
  128. +66 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_03.groovy
  129. +7 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_04.groovy
  130. +59 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_05.groovy
  131. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Command_06x.groovy
  132. +28 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Comments_01.groovy
  133. +117 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Comments_02.groovy
  134. +21 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DefaultMethod_01x.groovy
  135. +36 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DefaultMethod_02x.groovy
  136. +7 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DoWhile_01x.groovy
  137. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DoWhile_02x.groovy
  138. +11 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
  139. +14 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/DoWhile_04x.groovy
  140. +38 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ElvisAssignment_01x.groovy
  141. +44 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/EnumDeclaration_01.groovy
  142. +52 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/EnumDeclaration_02.groovy
  143. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/EnumDeclaration_03.groovy
  144. +230 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_01.groovy
  145. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_02.groovy
  146. +31 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_03.groovy
  147. +62 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_04.groovy
  148. +40 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_05.groovy
  149. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_06.groovy
  150. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_07.groovy
  151. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_08.groovy
  152. +16 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_09.groovy
  153. +25 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_10.groovy
  154. +16 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_11.groovy
  155. +17 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_12.groovy
  156. +45 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_13.groovy
  157. +22 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_14.groovy
  158. +127 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_15.groovy
  159. +22 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_16.groovy
  160. +141 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_17.groovy
  161. +26 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_18.groovy
  162. +32 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_19.groovy
  163. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_20.groovy
  164. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_21x.groovy
  165. +11 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_22x.groovy
  166. +97 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Expression_23x.groovy
  167. +55 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/For_01.groovy
  168. +36 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/For_02.groovy
  169. +37 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/For_03.groovy
  170. +36 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/For_04x.groovy
  171. +38 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/For_05x.groovy
  172. +30 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/GString_01.groovy
  173. +59 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/GString_02.groovy
  174. +49 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/GString_03.groovy
  175. +52 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy
  176. +10 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy
  177. +44 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/IfElse_01.groovy
  178. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_01.groovy
  179. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_02.groovy
  180. +4 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_03.groovy
  181. +5 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_04.groovy
  182. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_05.groovy
  183. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_06.groovy
  184. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_07.groovy
  185. +28 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/ImportDeclaration_08.groovy
  186. +36 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/InterfaceDeclaration_01.groovy
  187. +42 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/InterfaceDeclaration_02.groovy
  188. +7 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/InterfaceDeclaration_03.groovy
  189. +15 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Label_01.groovy
  190. +48 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Lambda_01x.groovy
  191. +15 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/List_01.groovy
  192. +79 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Literal_01.groovy
  193. +48 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Literal_02.groovy
  194. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Literal_03.groovy
  195. +110 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/LocalVariableDeclaration_01.groovy
  196. +29 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Map_01.groovy
  197. +32 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/MethodDeclaration_01.groovy
  198. +41 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/MethodDeclaration_02.groovy
  199. +5 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/MethodPointer_01x.groovy
  200. +85 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/MethodReference_01x.groovy
  201. +21 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/NegativeRelationalOperators_01x.groovy
  202. +18 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/NegativeRelationalOperators_02x.groovy
  203. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_01.groovy
  204. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_02.groovy
  205. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_03.groovy
  206. +20 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_04.groovy
  207. +23 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_05.groovy
  208. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/PackageDeclaration_06.groovy
  209. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Return_01.groovy
  210. +10 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy
  211. +47 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/SafeIndex_02x.groovy
  212. +280 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/SafeIndex_03x.groovy
  213. +60 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Switch_01.groovy
  214. +36 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Synchronized_01.groovy
  215. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Throw_01.groovy
  216. +42 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TraitDeclaration_01.groovy
  217. +40 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TraitDeclaration_02.groovy
  218. +48 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TraitDeclaration_03.groovy
  219. +28 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TraitDeclaration_04.groovy
  220. +23 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TraitDeclaration_05.groovy
  221. +112 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TryCatch_01.groovy
  222. +266 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/TryWithResources_01x.groovy
  223. +24 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/Unicode_01.groovy
  224. +58 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/While_01.groovy
  225. +5 −0 subprojects/groovy-parser-antlr4/src/test/resources/core/While_02x.groovy
  226. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_01x.groovy
  227. +4 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_02x.groovy
  228. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_03x.groovy
  229. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_04x.groovy
  230. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_05x.groovy
  231. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/AbstractMethod_06x.groovy
  232. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Break_01x.groovy
  233. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Break_02x.groovy
  234. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Continue_01x.groovy
  235. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Continue_02x.groovy
  236. +4 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/DoWhile_01x.groovy
  237. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_01.groovy
  238. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_02.groovy
  239. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_03.groovy
  240. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_04.groovy
  241. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_05.groovy
  242. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_06.groovy
  243. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_07.groovy
  244. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_08.groovy
  245. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Expression_09.groovy
  246. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/List_01.groovy
  247. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/LocalVariableDeclaration_01.groovy
  248. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Modifier_01x.groovy
  249. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Modifier_02x.groovy
  250. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Modifier_03x.groovy
  251. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Modifier_04x.groovy
  252. +3 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Modifier_05x.groovy
  253. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/ParExpression_01x.groovy
  254. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/ParExpression_02x.groovy
  255. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/ParExpression_03x.groovy
  256. +2 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Parentheses_01.groovy
  257. +6 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Super_01x.groovy
  258. +9 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/Switch_01.groovy
  259. +8 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/This_01x.groovy
  260. +1 −0 subprojects/groovy-parser-antlr4/src/test/resources/fail/UnexpectedCharacter_01x.groovy
  261. +409 −0 subprojects/groovy-parser-antlr4/src/test/resources/geb-1.0/allsources.txt
  262. BIN subprojects/groovy-parser-antlr4/src/test/resources/geb-1.0/geb-1.0-allsources.zip
  263. +3,963 −0 subprojects/groovy-parser-antlr4/src/test/resources/gradle-3.1/allsources.txt
  264. BIN subprojects/groovy-parser-antlr4/src/test/resources/gradle-3.1/gradle-3.1-allsources.zip
  265. +1,150 −0 subprojects/groovy-parser-antlr4/src/test/resources/grails-3.2.0/allsources.txt
  266. BIN subprojects/groovy-parser-antlr4/src/test/resources/grails-3.2.0/grails-3.2.0-allsources.zip
  267. +2,744 −0 subprojects/groovy-parser-antlr4/src/test/resources/groovy-2.5.0/allscripts.txt
  268. +1,844 −0 subprojects/groovy-parser-antlr4/src/test/resources/groovy-2.5.0/allsources.txt
  269. BIN ...roovy-parser-antlr4/src/test/resources/groovy-2.5.0/groovy-2.5.0-SNAPSHOT-20160921-allscripts.zip
  270. BIN ...roovy-parser-antlr4/src/test/resources/groovy-2.5.0/groovy-2.5.0-SNAPSHOT-20160921-allsources.zip
  271. +294 −0 subprojects/groovy-parser-antlr4/src/test/resources/spock-spock-1.1-rc-2/allsources.txt
  272. BIN .../groovy-parser-antlr4/src/test/resources/spock-spock-1.1-rc-2/spock-spock-1.1-rc-2-allsources.zip
@@ -15,3 +15,4 @@ bin/
.settings/
.classpath
.project
.shelf
@@ -19,7 +19,6 @@ sudo: required

matrix:
include:
- jdk: oraclejdk7
- jdk: oraclejdk8
addons:
apt:
@@ -28,7 +27,7 @@ matrix:

install: true

script: travis_wait 40 ./gradlew test
script: travis_wait 60 ./gradlew -PuseAntlr4=true test

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -31,6 +31,9 @@ buildscript {
maven {
url "https://plugins.gradle.org/m2/"
}
maven {
url 'https://jitpack.io'
}
}

dependencies {
@@ -42,6 +45,8 @@ buildscript {
//classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.3"
classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.3.2"

classpath "com.github.danielsun1106:antlr4-gradle-plugin:v0.1.2"
}
}

@@ -76,8 +81,8 @@ allprojects {
apply plugin: 'java'

buildDir = 'target'
sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8

group = 'org.codehaus.groovy'
version = groovyVersion
@@ -170,6 +175,7 @@ ext {
xmlunitVersion = '1.6'
xstreamVersion = '1.4.9'
spockVersion = '1.1-groovy-2.4-SNAPSHOT' // supports 3.0
antlr4Version = '4.6.0.3'
isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot")
}

@@ -307,6 +313,8 @@ sourceSets {
}
}

apply from: 'subprojects/groovy-parser-antlr4/build.gradle'

// make sure examples can be compiled, even if we don't run them
// todo: reorganize examples so that we can run them too
check {
@@ -444,16 +452,16 @@ allprojects {
tasks.withType(GroovyCompile) {
logger.info("Building ${project.name}:${name} with InvokeDynamic support activated")
groovyOptions.optimizationOptions.indy = true
sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
tasks.withType(JavaCompile) {
if (project.name=='performance') {
sourceCompatibility = 1.8
targetCompatibility = 1.8
} else {
sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
}
jar {
@@ -466,18 +474,18 @@ compileTestGroovy {
groovyOptions.fork(memoryMaximumSize: groovycTest_mx)
}

// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for future?
// TODO superfluous to check for JDK8 for Gradle version 3.2+ but leave for future?
task checkCompatibility {
doLast {
assert JavaVersion.current().java7Compatible
assert JavaVersion.current().java8Compatible
}
}

if (!JavaVersion.current().java7Compatible) {
if (!JavaVersion.current().java8Compatible) {
logger.lifecycle '''
**************************************** WARNING ********************************************
****** You are running the build with an older JDK. NEVER try to release with 1.6. ******
****** You must use a JDK 1.7+ in order to compile all features of the language. ******
****** You must use a JDK 1.8+ in order to compile all features of the language. ******
*********************************************************************************************
'''
}
@@ -193,7 +193,8 @@ 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/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'
}
@@ -46,7 +46,7 @@ def javadocSpec = {
version = true
overview = rootProject.file('src/main/overviewj.html')
footer = doc.footer
source = '1.7'
source = '1.8'
links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/',
'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/',
'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/')
@@ -89,6 +89,7 @@ javadocAll {
}
javadocAll javadocSpec


// Root project has an extra 'all' groovydoc task
task groovydocAll(type: Groovydoc)
groovydocAll {
@@ -183,7 +184,7 @@ allprojects {
apply plugin: 'javadocHotfix'
}

javadocAll.options.source = '1.7'
javadocAll.options.source = '1.8'

if (JavaVersion.current().isJava8Compatible()) {
allprojects {
@@ -0,0 +1,22 @@
package groovy.lang;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* An annotation to hold the groovydoc for the annotated element at runtime, we can it "Runtime Groovydoc".
* Runtime Groovydoc is a bit like Python's Documentation Strings and will be useful for IDE and developers who set a high value on documentations.
*
* The usage is very simple, just place @Groovydoc at the beginning of the content of groovydoc, then the new parser Parrot will attach the annotation Groovydoc automatically
*
* @since 3.0.0
*/
@Documented
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
@Retention(RetentionPolicy.RUNTIME)
public @interface Groovydoc {
String value();
}
Oops, something went wrong.

0 comments on commit a3f8671

Please sign in to comment.
You can’t perform that action at this time.