Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/49fae701 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/49fae701 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/49fae701 Branch: refs/heads/master Commit: 49fae701c71fa6e52882e7a9c82715e9d92a7589 Parents: 0550da4 38c7a74 Author: Paul King <[email protected]> Authored: Sat Mar 31 16:00:09 2018 +1000 Committer: Paul King <[email protected]> Committed: Sat Mar 31 16:00:09 2018 +1000 ---------------------------------------------------------------------- build.gradle | 3 +- gradle/binarycompatibility.gradle | 2 +- gradle/pomconfigurer.gradle | 3 + gradle/test.gradle | 4 +- src/antlr/GroovyLexer.g4 | 4 +- .../groovy/groovy/lang/GroovyClassLoader.java | 17 +- .../groovy/groovy/lang/NonEmptySequence.java | 11 +- src/main/groovy/groovy/lang/Sequence.java | 41 +- .../transform/builder/InitializerStrategy.java | 3 +- src/main/groovy/groovy/util/ObservableList.java | 17 +- src/main/groovy/groovy/util/ObservableMap.java | 15 +- src/main/groovy/groovy/util/ObservableSet.java | 14 +- .../groovy/ast/tools/AnnotatedNodeUtils.java | 13 +- .../apache/groovy/ast/tools/ClassNodeUtils.java | 3 +- .../org/codehaus/groovy/antlr/LexerFrame.java | 1 + .../reflection/GroovyClassValueFactory.java | 8 +- .../codehaus/groovy/runtime/ClassExtender.java | 89 - .../groovy/runtime/ComposedClosure.java | 3 +- .../groovy/runtime/DefaultGroovyMethods.java | 1940 +----------------- .../runtime/DefaultGroovyStaticMethods.java | 47 +- .../groovy/runtime/EncodingGroovyMethods.java | 43 +- .../codehaus/groovy/runtime/GStringImpl.java | 2 +- .../codehaus/groovy/runtime/MethodClosure.java | 5 +- .../groovy/runtime/ScriptReference.java | 3 +- .../groovy/runtime/memoize/CommonCache.java | 34 +- .../runtime/memoize/ConcurrentCommonCache.java | 42 +- .../groovy/runtime/memoize/EvictableCache.java | 18 +- .../groovy/runtime/memoize/LRUCache.java | 3 - .../runtime/memoize/LRUProtectionStorage.java | 2 - .../groovy/runtime/memoize/Memoize.java | 2 - .../groovy/runtime/memoize/MemoizeCache.java | 2 - .../runtime/memoize/NullProtectionStorage.java | 2 - .../runtime/memoize/ProtectionStorage.java | 2 - .../runtime/memoize/StampedCommonCache.java | 39 +- .../memoize/UnlimitedConcurrentCache.java | 35 +- .../metaclass/MissingMethodExecutionFailed.java | 1 + .../codehaus/groovy/syntax/SyntaxException.java | 6 +- .../transform/AbstractASTTransformation.java | 6 +- .../NamedVariantASTTransformation.java | 8 +- .../TupleConstructorASTTransformation.java | 3 +- .../stc/StaticTypeCheckingVisitor.java | 14 +- .../vmplugin/v8/PluginDefaultGroovyMethods.java | 86 + src/test/groovy/bugs/Groovy4386_Bug.groovy | 4 +- .../java/org/apache/groovy/util/MapsTest.java | 49 - .../ConcurrentLinkedHashMapTest.java | 89 - .../runtime/EncodingGroovyMethodsTest.java | 30 - src/test/org/apache/groovy/util/MapsTest.java | 49 + .../ConcurrentLinkedHashMapTest.java | 89 + .../runtime/EncodingGroovyMethodsTest.java | 36 + .../groovy/runtime/NewStaticMetaMethodTest.java | 2 +- .../runtime/memoize/CacheCleanupTest.groovy | 15 +- .../groovy/runtime/memoize/CommonCacheTest.java | 2 +- .../memoize/ConcurrentCommonCacheTest.java | 2 +- .../runtime/memoize/StampedCommonCacheTest.java | 2 +- .../memoize/UnlimitedConcurrentCacheTest.java | 2 +- .../extensions/DateTimeStaticExtensions.java | 4 + subprojects/groovy-dateutil/build.gradle | 2 +- .../dateutil/extensions/DateUtilExtensions.java | 3 +- .../extensions/DateUtilStaticExtensions.java | 91 + .../gdk/WorkingWithDateUtilTypesTest.groovy | 11 +- subprojects/groovy-groovydoc/build.gradle | 1 + .../parser/antlr4/GroovyParserTest.groovy | 4 + .../src/test/resources/core/String_01x.groovy | 23 + 63 files changed, 701 insertions(+), 2405 deletions(-) ----------------------------------------------------------------------
