You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/08/23 08:21:31 UTC
[groovy] branch master updated (d8e1a80 -> 963186c)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from d8e1a80 Add openjdk18 build to Travis CI
new 52c9ae9 formatting: remove trailing whitespace on ends of lines of source files
new 963186c formatting: remove trailing whitespace on ends of lines of source files (benchmark files)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CONTRIBUTING.md | 2 +-
DOAP.rdf | 8 +-
README.adoc | 2 +-
benchmark/bench.groovy | 6 +-
benchmark/bench/ackermann.java | 2 +-
benchmark/bench/fannkuch.groovy | 8 +-
benchmark/bench/fannkuch.java | 24 +--
benchmark/bench/fasta.java | 6 +-
benchmark/bench/harmonic.java | 6 +-
benchmark/bench/magicsquares.java | 24 +--
benchmark/bench/meteor.java | 130 ++++++++--------
benchmark/bench/moments.java | 4 +-
benchmark/bench/pidigits.java | 32 ++--
benchmark/bench/process.java | 8 +-
benchmark/bench/regexdna.groovy | 2 +-
benchmark/bench/regexdna.java | 16 +-
benchmark/bench/revcomp.groovy | 2 +-
benchmark/bench/sumcol.java | 2 +-
benchmark/bench/wordfreq.java | 4 +-
...rg.apache.groovy-bad-practices-detection.gradle | 2 +-
.../groovy/org.apache.groovy-stresstest.gradle | 1 -
.../gradle/WriteExtensionDescriptorTask.groovy | 2 -
config/codenarc/codenarc.groovy | 66 ++++----
gradle/build-scans.gradle | 12 +-
security/groovy.policy | 8 +-
src/bin/java2groovy.bat | 4 +-
src/bin/startGroovy | 4 +-
src/main/groovy/groovy/beans/ListenerList.groovy | 4 +-
src/main/groovy/groovy/transform/Canonical.groovy | 8 +-
.../codehaus/groovy/ast/builder/AstBuilder.groovy | 13 +-
.../ast/builder/AstSpecificationCompiler.groovy | 1 -
.../customizers/ASTTransformationCustomizer.groovy | 1 -
.../groovy/tools/ast/TransformTestHelper.groovy | 2 +-
src/main/java/groovy/beans/Bindable.java | 34 ++--
src/main/java/groovy/beans/Vetoable.java | 34 ++--
.../java/groovy/lang/BenchmarkInterceptor.java | 16 +-
src/main/java/groovy/lang/Binding.java | 6 +-
src/main/java/groovy/lang/ClosureException.java | 2 +-
src/main/java/groovy/lang/GroovySystem.java | 10 +-
.../lang/IllegalPropertyAccessException.java | 6 +-
src/main/java/groovy/lang/MetaClass.java | 6 +-
src/main/java/groovy/lang/MetaClassRegistry.java | 16 +-
.../lang/MetaClassRegistryChangeEventListener.java | 2 +-
src/main/java/groovy/lang/MetaMethod.java | 8 +-
src/main/java/groovy/lang/MetaObjectProtocol.java | 5 +-
.../java/groovy/lang/MissingClassException.java | 2 +-
.../java/groovy/lang/MissingFieldException.java | 1 -
src/main/java/groovy/lang/MutableMetaClass.java | 2 +-
src/main/java/groovy/lang/PropertyValue.java | 1 -
.../groovy/lang/ReadOnlyPropertyException.java | 1 -
src/main/java/groovy/lang/SpreadMap.java | 2 +-
src/main/java/groovy/lang/Tuple10.java | 1 -
src/main/java/groovy/lang/Tuple11.java | 1 -
src/main/java/groovy/lang/Tuple12.java | 2 -
src/main/java/groovy/lang/Tuple13.java | 2 -
src/main/java/groovy/lang/Tuple14.java | 1 -
src/main/java/groovy/lang/Tuple15.java | 1 -
src/main/java/groovy/lang/Tuple16.java | 1 -
src/main/java/groovy/lang/Writable.java | 2 +-
src/main/java/groovy/namespace/QName.java | 2 +-
src/main/java/groovy/time/Duration.java | 20 +--
.../groovy/time/TimeDatumDependentDuration.java | 12 +-
src/main/java/groovy/time/TimeDuration.java | 16 +-
src/main/java/groovy/time/package.html | 4 +-
.../java/groovy/transform/AnnotationCollector.java | 34 ++--
src/main/java/groovy/transform/BaseScript.java | 4 +-
.../java/groovy/transform/InheritConstructors.java | 2 +-
src/main/java/groovy/transform/Memoized.java | 4 +-
src/main/java/groovy/transform/Synchronized.java | 4 +-
src/main/java/groovy/transform/ToString.java | 10 +-
src/main/java/groovy/transform/WithWriteLock.java | 6 +-
.../groovy/transform/stc/MapEntryOrKeyValue.java | 6 +-
src/main/java/groovy/ui/GroovySocketServer.java | 28 ++--
src/main/java/groovy/util/Eval.java | 22 +--
.../java/groovy/util/FactoryBuilderSupport.java | 2 +-
src/main/java/groovy/util/NodeBuilder.java | 2 +-
src/main/java/groovy/util/ObjectGraphBuilder.java | 2 +-
src/main/java/groovy/util/Proxy.java | 2 +-
.../apache/groovy/parser/antlr4/AstBuilder.java | 3 -
.../antlr4/TryWithResourcesASTTransformation.java | 1 -
.../antlr4/internal/DescriptiveErrorStrategy.java | 1 -
.../antlr4/internal/atnmanager/AtnManager.java | 1 -
.../concurrentlinkedhashmap/LinkedDeque.java | 1 -
.../codehaus/groovy/GroovyExceptionInterface.java | 2 +-
.../java/org/codehaus/groovy/antlr/EnumHelper.java | 6 +-
.../org/codehaus/groovy/ast/InnerClassNode.java | 6 +-
.../groovy/ast/InterfaceHelperClassNode.java | 6 +-
.../java/org/codehaus/groovy/ast/MixinNode.java | 2 +-
.../java/org/codehaus/groovy/ast/Variable.java | 12 +-
.../groovy/ast/expr/ArgumentListExpression.java | 6 +-
.../groovy/ast/expr/BooleanExpression.java | 4 +-
.../codehaus/groovy/ast/expr/ClassExpression.java | 4 +-
.../groovy/ast/expr/ClosureListExpression.java | 20 +--
.../groovy/ast/expr/ElvisOperatorExpression.java | 4 +-
.../org/codehaus/groovy/ast/expr/Expression.java | 6 +-
.../groovy/ast/expr/ExpressionTransformer.java | 2 +-
.../groovy/ast/expr/GStringExpression.java | 2 +-
.../ast/expr/NamedArgumentListExpression.java | 4 +-
.../groovy/ast/expr/PostfixExpression.java | 2 +-
.../groovy/ast/expr/TernaryExpression.java | 2 +-
.../codehaus/groovy/ast/stmt/BlockStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/BreakStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/CaseStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/CatchStatement.java | 6 +-
.../groovy/ast/stmt/ContinueStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/DoWhileStatement.java | 6 +-
.../org/codehaus/groovy/ast/stmt/ForStatement.java | 14 +-
.../org/codehaus/groovy/ast/stmt/IfStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/LoopingStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/SwitchStatement.java | 6 +-
.../groovy/ast/stmt/SynchronizedStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/ThrowStatement.java | 4 +-
.../groovy/ast/stmt/TryCatchStatement.java | 4 +-
.../codehaus/groovy/classgen/GeneratorContext.java | 2 +-
.../groovy/classgen/asm/AssertionWriter.java | 34 ++--
.../asm/BinaryBooleanExpressionHelper.java | 20 +--
.../classgen/asm/BinaryDoubleExpressionHelper.java | 14 +-
.../classgen/asm/BinaryExpressionWriter.java | 58 +++----
.../classgen/asm/BinaryFloatExpressionHelper.java | 32 ++--
.../classgen/asm/BinaryIntExpressionHelper.java | 34 ++--
.../classgen/asm/BinaryLongExpressionHelper.java | 4 +-
.../classgen/asm/BinaryObjectExpressionHelper.java | 20 +--
.../groovy/classgen/asm/BytecodeVariable.java | 10 +-
.../groovy/classgen/asm/CallSiteWriter.java | 26 ++--
.../classgen/asm/ExpressionAsVariableSlot.java | 2 +-
.../groovy/classgen/asm/VariableSlotLoader.java | 6 +-
.../classgen/asm/indy/IndyCallSiteWriter.java | 6 +-
.../classgen/asm/indy/InvokeDynamicWriter.java | 16 +-
.../org/codehaus/groovy/classgen/asm/package.html | 2 +-
.../asm/sc/StaticTypesWriterController.java | 6 +-
.../codehaus/groovy/control/ClassNodeResolver.java | 40 ++---
.../org/codehaus/groovy/control/CompilePhase.java | 46 +++---
.../MultipleCompilationErrorsException.java | 4 +-
.../groovy/control/io/FileReaderSource.java | 4 +-
.../org/codehaus/groovy/control/io/NullWriter.java | 6 +-
.../codehaus/groovy/control/io/ReaderSource.java | 6 +-
.../groovy/control/io/StringReaderSource.java | 4 +-
.../groovy/control/io/URLReaderSource.java | 4 +-
.../groovy/reflection/CachedConstructor.java | 2 +-
.../codehaus/groovy/reflection/CachedMethod.java | 8 +-
.../groovy/reflection/ReflectionCache.java | 4 +-
.../reflection/stdclasses/BooleanCachedClass.java | 2 +-
.../reflection/stdclasses/CachedSAMClass.java | 4 +-
.../reflection/stdclasses/LongCachedClass.java | 1 -
.../org/codehaus/groovy/runtime/ArrayUtil.java | 6 +-
.../groovy/runtime/BytecodeInterface8.java | 96 ++++++------
.../codehaus/groovy/runtime/ConvertedClosure.java | 2 +-
.../groovy/runtime/IteratorClosureAdapter.java | 4 +-
.../org/codehaus/groovy/runtime/MethodKey.java | 4 +-
.../codehaus/groovy/runtime/MethodRankHelper.java | 30 ++--
.../org/codehaus/groovy/runtime/NullObject.java | 4 +-
.../groovy/runtime/StreamGroovyMethods.java | 2 +-
.../runtime/callsite/BooleanClosureWrapper.java | 4 +-
.../callsite/BooleanReturningMethodInvoker.java | 8 +-
.../groovy/runtime/callsite/ConstructorSite.java | 2 +-
.../groovy/runtime/callsite/NullCallSite.java | 2 +-
.../groovy/runtime/dgmimpl/NumberNumberMinus.java | 1 -
.../runtime/memoize/LRUProtectionStorage.java | 2 +-
.../codehaus/groovy/runtime/memoize/Memoize.java | 8 +-
.../runtime/metaclass/ClosureStaticMetaMethod.java | 2 +-
.../runtime/metaclass/ConcurrentReaderHashMap.java | 52 +++----
.../runtime/metaclass/DefaultMetaClassInfo.java | 82 +++++-----
.../groovy/runtime/metaclass/MethodHelper.java | 2 +-
.../runtime/metaclass/MethodMetaProperty.java | 8 +-
.../metaclass/MethodSelectionException.java | 8 +-
.../groovy/runtime/metaclass/ReflectorLoader.java | 10 +-
.../metaclass/ThreadManagedMetaBeanProperty.java | 2 +-
.../runtime/typehandling/BigIntegerMath.java | 12 +-
.../runtime/typehandling/FloatingPointMath.java | 10 +-
.../groovy/runtime/typehandling/IntegerMath.java | 8 +-
.../groovy/runtime/typehandling/LongMath.java | 16 +-
.../java/org/codehaus/groovy/syntax/ASTHelper.java | 2 +-
.../org/codehaus/groovy/tools/GroovyStarter.java | 14 +-
.../java/org/codehaus/groovy/tools/Utilities.java | 2 +-
.../groovy/tools/gse/DependencyTracker.java | 4 +-
.../codehaus/groovy/tools/gse/StringSetMap.java | 6 +-
.../codehaus/groovy/tools/shell/util/Logger.java | 12 +-
.../groovy/tools/shell/util/MessageSource.java | 50 +++---
.../groovy/tools/shell/util/Preferences.java | 2 +-
.../transformers/BooleanExpressionTransformer.java | 2 +-
.../groovy/transform/stc/ExtensionMethodNode.java | 2 +-
.../org/codehaus/groovy/util/LazyReference.java | 4 +-
.../groovy/util/ManagedConcurrentValueMap.java | 4 +-
.../org/codehaus/groovy/util/ManagedReference.java | 12 +-
.../org/codehaus/groovy/util/ReferenceBundle.java | 2 +-
.../org/codehaus/groovy/util/ReferenceManager.java | 12 +-
.../org/codehaus/groovy/util/ReferenceType.java | 10 +-
.../java/org/codehaus/groovy/util/ReleaseInfo.java | 6 +-
src/spec/doc/_design-pattern-flyweight.adoc | 1 -
src/spec/doc/_design-pattern-loan-my-resource.adoc | 1 -
src/spec/doc/_design-pattern-proxy.adoc | 1 -
src/spec/doc/_design-pattern-state.adoc | 1 -
src/spec/doc/_design-pattern-visitor.adoc | 1 -
src/spec/doc/core-domain-specific-languages.adoc | 2 +-
src/spec/doc/design-patterns-in-groovy.adoc | 3 +-
src/spec/test/ClassTest.groovy | 2 +-
.../CompilerDirectivesASTTransformsTest.groovy | 4 +-
.../DeclarativeConcurrencyASTTransformsTest.groovy | 2 +-
src/spec/test/DesignPatternsTest.groovy | 42 ++---
src/spec/test/PackageTest.groovy | 54 +++----
src/spec/test/SyntaxTest.groovy | 16 +-
src/spec/test/builder/FileTreeBuilderTest.groovy | 6 +-
src/spec/test/builder/NodeBuilderTest.groovy | 2 +-
.../test/gdk/WorkingWithCollectionsTest.groovy | 2 +-
.../test/metaprogramming/GroovyObjectTest.groovy | 18 +--
.../InterceptionThroughMetaClassTest.groovy | 4 +-
.../MethodPropertyMissingTest.groovy | 2 +-
src/spec/test/semantics/OptionalityTest.groovy | 12 +-
src/spec/test/semantics/TheGroovyTruthTest.groovy | 18 +--
.../typing/TypeCheckingExtensionSpecTest.groovy | 8 +-
src/tck/test/gls/ch03/s01/Unicode1.groovy | 4 +-
src/tck/test/gls/ch03/s01/Unicode2.groovy | 2 +-
src/tck/test/gls/ch03/s02/Longest1.groovy | 8 +-
src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy | 8 +-
src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy | 16 +-
src/test-resources/bugs/BUG-GROOVY-8426.groovy | 2 +-
src/test-resources/core/Command_04.groovy | 1 -
src/test-resources/core/List_01.groovy | 2 +-
src/test/gls/annotations/AnnotationTest.groovy | 14 +-
.../gls/annotations/AnnotationsInfoTest.groovy | 6 +-
.../closures/AnnotationClosureTest.groovy | 4 +-
.../AnnotationClosureWithNonLocalVariable.groovy | 6 +-
src/test/gls/ch06/s05/GName1Test.groovy | 76 ++++-----
src/test/gls/generics/GenericsBytecodeTest.groovy | 2 +-
.../gls/invocation/ClosureDelegationTest.groovy | 4 +-
src/test/gls/invocation/CovariantReturnTest.groovy | 6 +-
.../invocation/GroovyObjectInheritanceTest.groovy | 20 +--
src/test/gls/invocation/MethodSelectionTest.groovy | 72 ++++-----
.../invocation/StaticMethodInvocationTest.groovy | 8 +-
src/test/gls/scope/NameResolvingTest.groovy | 4 +-
src/test/gls/scope/StaticScopeTest.groovy | 8 +-
src/test/gls/sizelimits/StringSizeTest.groovy | 10 +-
.../MultipleAssignmentDeclarationTest.groovy | 18 +--
src/test/gls/statements/ReturnTest.groovy | 2 +-
src/test/gls/syntax/AssertTest.groovy | 2 +-
src/test/gls/syntax/Gep3Test.groovy | 22 +--
src/test/gls/syntax/ParsingTest.groovy | 6 +-
.../types/BooleanExpressionConversionTest.groovy | 14 +-
src/test/gls/types/GroovyCastTest.groovy | 6 +-
.../groovy/AbstractClassAndInterfaceTest.groovy | 56 +++----
src/test/groovy/ActorTest.groovy | 2 +-
src/test/groovy/ArrayAutoboxingTest.groovy | 8 +-
src/test/groovy/ArrayParamMethodTest.groovy | 8 +-
src/test/groovy/AsTest.groovy | 8 +-
src/test/groovy/Bar.groovy | 2 +-
src/test/groovy/BindingTest.groovy | 16 +-
src/test/groovy/CastTest.groovy | 48 +++---
src/test/groovy/ClassExpressionTest.groovy | 18 +--
src/test/groovy/ClassLoaderBug.groovy | 2 +-
src/test/groovy/ClassTest.groovy | 4 +-
src/test/groovy/ClosureDefaultParameterTest.groovy | 2 +-
src/test/groovy/ClosureMethodCallTest.groovy | 2 +-
.../ClosureReturnWithoutReturnStatementTest.groovy | 4 +-
src/test/groovy/CompareToTest.groovy | 12 +-
src/test/groovy/CompareTypesTest.groovy | 64 ++++----
src/test/groovy/DefaultParamClosureTest.groovy | 8 +-
src/test/groovy/DoWhileLoopTest.groovy | 2 +-
src/test/groovy/DollarEscapingTest.groovy | 6 +-
src/test/groovy/DynamicMemberTest.groovy | 10 +-
src/test/groovy/Foo.groovy | 8 +-
src/test/groovy/ForLoopTest.groovy | 2 +-
src/test/groovy/GStringTest.groovy | 2 +-
src/test/groovy/GlobalPrintlnTest.groovy | 2 +-
src/test/groovy/GroovyMethodsTest.groovy | 18 +--
src/test/groovy/GroovyTruthTest.groovy | 4 +-
src/test/groovy/HeredocsTest.groovy | 4 +-
src/test/groovy/IdentityClosureTest.groovy | 8 +-
src/test/groovy/InstanceofTest.groovy | 16 +-
src/test/groovy/ListIteratingTest.groovy | 8 +-
src/test/groovy/LocalPropertyTest.groovy | 8 +-
src/test/groovy/LocalVariableTest.groovy | 4 +-
src/test/groovy/LogicTest.groovy | 16 +-
src/test/groovy/LoopBreakTest.groovy | 2 +-
src/test/groovy/MapTest.groovy | 10 +-
.../groovy/MethodCallWithoutParenthesisTest.groovy | 18 +--
src/test/groovy/MinusEqualsTest.groovy | 24 +--
src/test/groovy/MultilineStringTest.groovy | 2 +-
src/test/groovy/MultiplyDivideEqualsTest.groovy | 42 ++---
src/test/groovy/NewExpressionTest.groovy | 6 +-
src/test/groovy/NullPropertyTest.groovy | 4 +-
src/test/groovy/OverloadInvokeMethodTest.groovy | 4 +-
src/test/groovy/OverridePropertyGetterTest.groovy | 2 +-
src/test/groovy/PlusEqualsTest.groovy | 28 ++--
src/test/groovy/PostfixTest.groovy | 20 +--
src/test/groovy/PrefixTest.groovy | 26 ++--
src/test/groovy/PrimitiveArraysTest.groovy | 30 ++--
src/test/groovy/PrimitiveTypesTest.groovy | 22 +--
src/test/groovy/PrintTest.groovy | 10 +-
...ateVariableAccessFromAnotherInstanceTest.groovy | 4 +-
src/test/groovy/ProcessTest.groovy | 2 +-
src/test/groovy/PropertyTest.groovy | 8 +-
src/test/groovy/PropertyWithoutDotTest.groovy | 4 +-
src/test/groovy/SafeNavigationTest.groovy | 2 +-
src/test/groovy/SerializeTest.groovy | 4 +-
src/test/groovy/ShellTest.groovy | 16 +-
src/test/groovy/SingletonBugTest.groovy | 8 +-
src/test/groovy/SqlDateTest.groovy | 10 +-
src/test/groovy/StaticImportTest.groovy | 2 +-
src/test/groovy/SubscriptTest.groovy | 104 ++++++-------
src/test/groovy/ToArrayBugTest.groovy | 14 +-
src/test/groovy/UnsafeNavigationTest.groovy | 2 +-
src/test/groovy/VArgsTest.groovy | 52 +++----
src/test/groovy/VerbatimGStringTest.groovy | 14 +-
src/test/groovy/bugs/ArrayMethodCallBug.groovy | 4 +-
.../bugs/AssignmentInsideExpressionBug.groovy | 6 +-
.../bugs/BadLineNumberOnExceptionBugTest.groovy | 2 +-
src/test/groovy/bugs/BenchmarkBug.groovy | 4 +-
src/test/groovy/bugs/BooleanBug.groovy | 8 +-
src/test/groovy/bugs/Bytecode2Bug.groovy | 21 ++-
src/test/groovy/bugs/Bytecode3Bug.groovy | 6 +-
src/test/groovy/bugs/Bytecode4Bug.groovy | 8 +-
src/test/groovy/bugs/Bytecode5Bug.groovy | 2 +-
src/test/groovy/bugs/Bytecode6Bug.groovy | 6 +-
src/test/groovy/bugs/BytecodeBug.groovy | 6 +-
.../bugs/CallingClosuresWithClosuresBug.groovy | 4 +-
.../groovy/bugs/ClassGeneratorFixesTest.groovy | 2 +-
src/test/groovy/bugs/ClassInNamedParamsBug.groovy | 10 +-
.../groovy/bugs/ClosureParameterPassingBug.groovy | 10 +-
.../groovy/bugs/ClosureTypedVariableBug.groovy | 15 +-
src/test/groovy/bugs/ClosureVariableBug.groovy | 16 +-
.../bugs/ClosureWithStaticVariablesBug.groovy | 4 +-
src/test/groovy/bugs/ConstructorBug.groovy | 6 +-
src/test/groovy/bugs/DefVariableBug.groovy | 6 +-
.../bugs/DirectMethodCallWithVargsTest.groovy | 18 +--
src/test/groovy/bugs/ForLoopBug.groovy | 1 -
src/test/groovy/bugs/FullyQualifiedClassBug.groovy | 2 +-
src/test/groovy/bugs/GetterBug.groovy | 32 ++--
src/test/groovy/bugs/Groovy1018_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy1081_Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy1462_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy239_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy252_Bug.groovy | 16 +-
src/test/groovy/bugs/Groovy2773Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy278_Bug.groovy | 20 ++-
src/test/groovy/bugs/Groovy308_Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3135Bug.groovy | 14 +-
src/test/groovy/bugs/Groovy3139Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3156And2621Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3163Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3208Bug.groovy | 18 +--
src/test/groovy/bugs/Groovy3235Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3238Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3305Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3383Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3389Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3410Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3422.groovy | 2 +-
src/test/groovy/bugs/Groovy3446Bug.groovy | 1 -
src/test/groovy/bugs/Groovy3465Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3511Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3519Bug.groovy | 4 -
src/test/groovy/bugs/Groovy3574Bug.groovy | 14 +-
src/test/groovy/bugs/Groovy3679Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3718Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3720Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3723Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3749Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy3768Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3770Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3776Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3827Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3831Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3834Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3868Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy389_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4035Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4038Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4043Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4046Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4069Bug.groovy | 44 +++---
src/test/groovy/bugs/Groovy4075Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4080Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4081Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4107Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4111Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4116Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4121Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4133Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4169Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4188Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4190Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4191Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4202Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4241Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4243Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4246Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4264Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4273Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4293Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4410Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4414Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy4415Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4416Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4449Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4497Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy4958Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4999Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5030Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy513_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5212Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5260Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy5267Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5272Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy6271Bug.groovy | 16 +-
src/test/groovy/bugs/Groovy6804Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy7031Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy7204Bug.groovy | 172 ++++++++++-----------
src/test/groovy/bugs/Groovy770_Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy7867.groovy | 10 +-
src/test/groovy/bugs/Groovy7995Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8055Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8059Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8084Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8085Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8090Bug.groovy | 10 +-
src/test/groovy/bugs/Groovy8138Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8140Bug.groovy | 1 -
src/test/groovy/bugs/Groovy8212Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy831_Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy8389Bug.groovy | 32 ++--
src/test/groovy/bugs/Groovy8405Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy8444.groovy | 8 +-
src/test/groovy/bugs/Groovy8474Bug.groovy | 92 +++++------
src/test/groovy/bugs/Groovy8595Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy8629Bug.groovy | 22 +--
src/test/groovy/bugs/Groovy8819Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8947.groovy | 2 +-
src/test/groovy/bugs/Groovy9329.groovy | 4 +-
src/test/groovy/bugs/Groovy9589.groovy | 1 -
src/test/groovy/bugs/Groovy9601.groovy | 10 +-
src/test/groovy/bugs/GroovyInnerEnumBug.groovy | 2 +-
src/test/groovy/bugs/GuillaumesBug.groovy | 2 +-
src/test/groovy/bugs/GuillaumesMapBug.groovy | 30 ++--
...vokeNormalMethodFromBuilder_Groovy657Bug.groovy | 2 +-
.../groovy/bugs/IterateOverCustomTypeBug.groovy | 6 +-
src/test/groovy/bugs/MarkupAndMethodBug.groovy | 12 +-
...MethodCallWithoutParensInStaticMethodBug.groovy | 2 +-
src/test/groovy/bugs/MethodClosureTest.groovy | 4 +-
src/test/groovy/bugs/MethodDispatchBug.groovy | 4 +-
src/test/groovy/bugs/NestedClosure2Bug.groovy | 12 +-
src/test/groovy/bugs/NestedClosureBug.groovy | 4 +-
src/test/groovy/bugs/NullCompareBug.groovy | 2 +-
.../groovy/bugs/OverloadInvokeMethodBug.groovy | 6 +-
src/test/groovy/bugs/PrimitivePropertyBug.groovy | 4 +-
src/test/groovy/bugs/PrintlnWithNewBug.groovy | 2 +-
src/test/groovy/bugs/RodsBooleanBug.groovy | 6 +-
.../groovy/bugs/StaticClosurePropertyBug.groovy | 4 +-
src/test/groovy/bugs/StaticMethodCallBug.groovy | 2 +-
.../groovy/bugs/SubscriptAndExpressionBug.groovy | 36 ++---
.../bugs/SubscriptOnPrimitiveTypeArrayBug.groovy | 10 +-
.../groovy/bugs/SubscriptOnStringArrayBug.groovy | 10 +-
src/test/groovy/bugs/SuperMethod2Bug.groovy | 46 +++---
.../groovy/bugs/SynchronizedBytecodeBug.groovy | 168 ++++++++++----------
src/test/groovy/bugs/TestBase.groovy | 6 +-
src/test/groovy/bugs/TestDerived.groovy | 3 +-
src/test/groovy/bugs/TryCatch2Bug.groovy | 6 +-
src/test/groovy/bugs/TryCatchBug.groovy | 2 +-
src/test/groovy/bugs/VariablePrecedence.groovy | 4 +-
src/test/groovy/bugs/VariableScopingBug.groovy | 2 +-
src/test/groovy/bugs/ZoharsBug.groovy | 4 +-
.../bugs/groovy5912/otherpkg/Groovy5912Bug.groovy | 6 +-
src/test/groovy/bugs/groovy8966/Groovy8966.groovy | 2 +-
src/test/groovy/bugs/groovy9204/Groovy9204.groovy | 2 +-
.../groovy/bugs/groovy9236/Groovy9236Bug.groovy | 4 +-
.../groovy/generated/DelegateGeneratedTest.groovy | 6 +-
src/test/groovy/lang/CategoryAnnotationTest.groovy | 30 ++--
src/test/groovy/lang/ExceptionTest.groovy | 12 +-
.../lang/ExpandoMetaClassConstructorTest.groovy | 2 +-
src/test/groovy/lang/ExpandoMetaClassTest.groovy | 2 +-
src/test/groovy/lang/GroovyClassLoaderTest.groovy | 6 +-
src/test/groovy/lang/GroovyShellTest.java | 6 +-
src/test/groovy/lang/MixinTest.groovy | 4 +-
src/test/groovy/lang/SpreadMapTest.java | 4 +-
src/test/groovy/lang/StripMarginTest.groovy | 2 +-
.../groovy/mock/example/SandwichMakerTest.groovy | 2 +-
.../mock/interceptor/MockSingleCallTest.groovy | 2 +-
.../groovy/operator/BigDecimalOperatorsTest.groovy | 16 +-
.../operator/BigIntegerOperationsTest.groovy | 6 +-
.../groovy/operator/IntegerOperatorsTest.groovy | 44 +++---
src/test/groovy/operator/NegateListsTest.groovy | 2 +-
.../groovy/operator/StringOperatorsTest.groovy | 2 +-
.../groovy/operator/TernaryOperatorsTest.groovy | 10 +-
.../groovy/operator/UnaryMinusOperatorTest.groovy | 16 +-
src/test/groovy/transform/ReadWriteLockTest.groovy | 2 +-
src/test/groovy/transform/stc/WithSTCTest.groovy | 2 +-
src/test/groovy/tree/ClosureClassLoaderBug.groovy | 4 +-
src/test/groovy/tree/NestedClosureBugTest.groovy | 2 +-
src/test/groovy/tree/SmallTreeTest.groovy | 6 +-
src/test/groovy/tree/TreeTest.groovy | 28 ++--
src/test/groovy/tree/VerboseTreeTest.groovy | 28 ++--
src/test/groovy/util/BuilderSupportTest.groovy | 4 +-
src/test/groovy/util/ConfigObjectTest.groovy | 18 +--
src/test/groovy/util/ConfigSlurperTest.groovy | 2 +-
.../groovy/util/FactoryBuilderSupportTest.groovy | 2 +-
src/test/groovy/util/ObjectGraphBuilderTest.groovy | 2 +-
.../groovy/util/ProxyGeneratorAdapterTest.groovy | 10 +-
src/test/groovy/util/ProxyGeneratorTest.groovy | 6 +-
src/test/groovy/util/ProxyTest.groovy | 12 +-
.../groovy/lang/GroovyObjectHelperTest.groovy | 2 +-
.../org/apache/groovy/util/JavaShellTest.groovy | 4 +-
src/test/org/codehaus/groovy/ast/ASTNodeTest.java | 2 +-
.../org/codehaus/groovy/ast/MethodNodeTest.groovy | 8 +-
.../groovy/ast/source/Groovy3049Test.groovy | 34 ++--
.../groovy/ast/source/Groovy3050Test.groovy | 25 ++-
.../groovy/ast/source/Groovy3051Test.groovy | 72 +++++----
.../classgen/CallClosureFieldAsMethodTest.groovy | 2 +-
.../codehaus/groovy/classgen/CallSiteTest.groovy | 2 +-
.../groovy/classgen/ConstructorIssueTest.groovy | 8 +-
src/test/org/codehaus/groovy/classgen/Main.groovy | 2 +-
.../codehaus/groovy/classgen/MetaClassTest.groovy | 2 +-
.../codehaus/groovy/classgen/VerifierTest.groovy | 8 +-
.../classgen/asm/BinaryOperationsTest.groovy | 8 +-
.../classgen/asm/DirectMethodCallTest.groovy | 6 +-
.../groovy/classgen/asm/HotSwapTest.groovy | 4 +-
.../asm/InstructionSequenceHelperClassTest.groovy | 4 +-
.../groovy/classgen/asm/MethodPatternsTest.groovy | 4 +-
.../asm/sc/StaticCompileConstructorsTest.groovy | 2 +-
.../classgen/asm/sc/StaticCompileMathTest.groovy | 2 +-
.../TupleConstructorStaticCompilationTest.groovy | 2 +-
.../classgen/asm/sc/bugs/Groovy6657Bug.groovy | 1 -
.../classgen/asm/sc/bugs/Groovy6693Bug.groovy | 26 ++--
.../classgen/asm/sc/bugs/Groovy7042Bug.groovy | 5 -
.../classgen/asm/sc/bugs/Groovy7883Bug.groovy | 30 ++--
.../classgen/asm/sc/bugs/Groovy8240Bug.groovy | 12 +-
.../asm/sc/bugs/ReproducibleBytecodeBugs.groovy | 6 +-
.../ASTTransformationCustomizerTest.groovy | 2 +-
.../groovy/control/io/FileReaderTest.groovy | 4 +-
.../runtime/InvokerHelperFormattingTest.groovy | 4 +-
.../codehaus/groovy/runtime/NullObjectTest.groovy | 12 +-
.../groovy/runtime/PerInstanceMetaClassTest.groovy | 4 +-
.../groovy/runtime/memoize/CacheCleanupTest.groovy | 2 +-
.../groovy/runtime/memoize/MemoizeTest.groovy | 18 +--
.../runtime/trampoline/TrampolineTest.groovy | 2 +-
src/test/org/codehaus/groovy/syntax/TokenTest.java | 2 +-
...otationMemberValuesResolutionV1StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV2StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV3StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV4StubsTest.groovy | 2 +-
.../DuplicateMethodAdditionInStubsTest.groovy | 6 +-
.../stubgenerator/RedundantCastInStubTest.groovy | 2 +-
.../stubgenerator/StringSourcesStubTestCase.groovy | 4 +-
.../StubGenerationForAnAnnotationStubsTest.groovy | 2 +-
...nForConstructorWithOptionalArgsStubsTest.groovy | 2 +-
.../UnAmbigousSuperConstructorCallStubsTest.groovy | 6 +-
.../AutoFinalTransformBlackBoxTest.groovy | 6 +-
.../transform/BaseScriptTransformTest.groovy | 10 +-
.../groovy/transform/CanonicalTransformTest.groovy | 26 ++--
.../transform/MemoizedASTTransformationTest.groovy | 2 +-
.../groovy/transform/NewifyTransformTest.groovy | 2 +-
.../groovy/transform/ToStringTransformTest.groovy | 6 +-
.../groovy/transform/stc/SignatureCodecTest.groovy | 8 +-
.../groovy/util/ManagedLinkedlistTest.groovy | 12 +-
.../v8/PluginDefaultGroovyMethodsTest.groovy | 6 +-
.../org/codehaus/groovy/classgen/TestSupport.java | 2 +-
.../src/main/java/groovy/ant/AntBuilder.java | 4 +-
.../codehaus/groovy/ant/CompileTaskSupport.java | 6 +-
.../java/org/codehaus/groovy/ant/FileScanner.java | 6 +-
.../java/org/codehaus/groovy/ant/GroovycTask.java | 2 +-
.../org/codehaus/groovy/ant/RootLoaderRef.java | 2 +-
.../org/codehaus/groovy/ant/UberCompileTask.java | 12 +-
.../groovy-ant/src/spec/doc/groovy-ant-task.adoc | 6 +-
.../groovy-ant/src/spec/doc/groovyc-ant-task.adoc | 1 -
.../src/test-resources/groovy/ant/AntTest.xml | 2 +-
.../test-resources/groovy/ant/AntTest_import.xml | 2 +-
.../test/groovy/groovy/ant/Groovy8496Test.groovy | 2 +-
.../groovy/org/codehaus/groovy/ant/GroovyTest.java | 6 +-
.../ast/builder/AstBuilderTransformation.java | 4 +-
.../test/groovy/groovy/bugs/MyConstants4272.java | 2 +-
.../bugs/MyConstantsASTTransformation4272.groovy | 14 +-
.../ast/builder/AstBuilderFromCodeTest.groovy | 4 +-
.../builder/AstBuilderFromSpecificationTest.groovy | 12 +-
.../ast/builder/AstBuilderFromStringTest.groovy | 6 +-
.../groovy/cli/picocli/CliBuilderTest.groovy | 2 +-
.../src/main/groovy/groovy/console/TextNode.groovy | 12 +-
.../groovy/groovy/console/TextTreeNodeMaker.groovy | 2 +-
.../groovy/groovy/console/ui/AstBrowser.groovy | 8 +-
.../groovy/console/ui/ConsoleTextEditor.java | 2 +-
.../ui/text/StructuredSyntaxDocumentFilter.java | 156 +++++++++----------
.../console/ui/text/StructuredSyntaxResources.java | 8 +-
.../groovy/console/ui/view/GTKDefaults.groovy | 2 +-
.../ui/HistoryRecordGetTextToRunTests.groovy | 8 +-
.../tests/doc/DocumentationExampleTests.groovy | 6 +-
.../tests/doc/RootClassExampleTests.groovy | 18 +--
.../contracts/tests/inv/InheritanceTests.groovy | 6 +-
.../contracts/tests/post/InheritanceTests.groovy | 2 +-
.../collection/runtime/QueryableCollection.java | 4 +-
.../test/org/apache/groovy/ginq/GinqTest.groovy | 168 ++++++++++----------
.../org/apache/groovy/ginq/GinqErrorTest.groovy | 10 +-
.../tools/groovydoc/ClasspathResourceManager.java | 2 +-
.../groovy/tools/groovydoc/MockOutputTool.java | 6 +-
.../groovydoc/SimpleGroovyExecutableMemberDoc.java | 4 +-
.../gstringTemplates/classLevel/classDocName.html | 18 +--
.../testfiles/ClassWithAnonymousInnerClass.java | 2 +-
.../apache/groovy/groovysh/BufferManager.groovy | 26 ++--
.../org/apache/groovy/groovysh/Groovysh.groovy | 2 +-
.../groovy/groovysh/commands/ShadowCommand.groovy | 6 +-
.../antlr4/VariableSyntaxCompleter.groovy | 1 -
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 2 +-
.../groovysh/commands/HelpCommandTest.groovy | 4 +-
.../groovy-jmx/src/spec/test/JmxTest.groovy | 18 +--
.../java/groovy/jmx/builder/MockManagedObject.java | 8 +-
.../test/groovy/groovy/json/JsonBuilderTest.groovy | 2 +-
.../groovy/json/StreamingJsonBuilderTest.groovy | 8 +-
.../groovy/jsr223/GroovyScriptEngineImpl.java | 8 +-
.../org/codehaus/groovy/jsr223/JSR223Test.groovy | 2 +-
.../groovy/macro/MacroTransformationTest.groovy | 2 +-
.../groovy/macro/matcher/ASTMatcherTest.groovy | 2 +-
.../java/groovy/servlet/AbstractHttpServlet.java | 8 +-
.../main/java/groovy/servlet/ServletBinding.java | 28 ++--
.../main/java/groovy/servlet/TemplateServlet.java | 4 +-
.../src/spec/test/servlet/GroovyServletTest.groovy | 2 +-
.../src/main/java/groovy/sql/GroovyRowResult.java | 2 +-
.../test/groovy/groovy/sql/SqlCompleteTest.groovy | 2 +-
.../main/groovy/groovy/swing/SwingBuilder.groovy | 2 +-
.../groovy/swing/factory/ActionFactory.groovy | 2 +-
.../groovy/groovy/swing/factory/BoxFactory.groovy | 2 +-
.../groovy/swing/factory/CollectionFactory.groovy | 2 +-
.../groovy/swing/factory/ComboBoxFactory.groovy | 2 +-
.../swing/factory/FormattedTextFactory.groovy | 2 +-
.../groovy/swing/factory/LineBorderFactory.groovy | 2 +-
.../groovy/groovy/swing/factory/MapFactory.groovy | 2 +-
.../groovy/swing/factory/MatteBorderFactory.groovy | 2 +-
.../groovy/swing/factory/SeparatorFactory.groovy | 2 +-
.../groovy/swing/factory/SplitPaneFactory.groovy | 2 +-
.../groovy/swing/factory/TableLayoutFactory.groovy | 4 +-
.../groovy/swing/factory/TableModelFactory.groovy | 2 +-
.../swing/factory/TitledBorderFactory.groovy | 2 +-
.../groovy/swing/factory/WindowFactory.groovy | 2 +-
.../groovy/groovy/swing/impl/DefaultAction.java | 2 +-
.../main/groovy/groovy/swing/impl/TableLayout.java | 4 +-
.../groovy/groovy/swing/impl/TableLayoutCell.java | 24 +--
.../groovy/groovy/swing/impl/TableLayoutRow.java | 8 +-
.../groovy/swing/model/DefaultTableColumn.java | 4 +-
.../java/groovy/swing/model/DefaultTableModel.java | 22 +--
.../main/java/groovy/swing/model/FormModel.java | 4 +-
.../java/groovy/swing/model/PropertyModel.java | 2 +-
.../main/java/groovy/swing/model/ValueHolder.java | 12 +-
.../groovy/swing/binding/BindingUpdatable.java | 4 +-
.../src/spec/test/SwingBuilderTest.groovy | 4 +-
.../groovy/groovy/swing/StrangeEventListener.java | 4 +-
.../TitledBorderFactoryJustificationTest.groovy | 4 +-
.../groovy/swing/beans/BindableSwingTest.groovy | 4 +-
.../groovy/swing/model/TableModelTest.groovy | 16 +-
.../src/spec/test/TemplateEnginesTest.groovy | 14 +-
.../groovy/test/JavadocAssertionTestBuilder.groovy | 26 ++--
.../groovy/test/JavadocAssertionTestSuite.groovy | 16 +-
.../test/JavadocAssertionTestBuilderTest.groovy | 24 +--
.../src/main/groovy/groovy/xml/Entity.groovy | 24 +--
.../groovy/xml/StreamingMarkupBuilder.groovy | 6 +-
.../src/main/java/groovy/xml/DOMBuilder.java | 4 +-
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../src/main/java/groovy/xml/NamespaceBuilder.java | 2 +-
.../java/groovy/xml/NamespaceBuilderSupport.java | 2 +-
.../src/main/java/groovy/xml/XmlSlurper.java | 4 +-
.../groovy/xml/slurpersupport/GPathResult.java | 2 +-
.../java/groovy/xml/slurpersupport/NodeChild.java | 2 +-
.../groovy/xml/slurpersupport/NodeParents.java | 8 +-
.../groovy/xml/slurpersupport/ReplacementNode.java | 2 +-
.../groovy/xml/streamingmarkupsupport/Builder.java | 16 +-
.../groovy-xml/src/spec/test/DOMBuilderTest.groovy | 4 +-
.../groovy-xml/src/spec/test/SaxBuilderTest.groovy | 10 +-
.../src/spec/test/StaxBuilderTest.groovy | 10 +-
.../src/test/groovy/groovy/xml/DOMTest.groovy | 26 ++--
.../groovy/groovy/xml/NamespaceNodeTest.groovy | 4 +-
.../src/test/groovy/groovy/xml/SAXTest.groovy | 10 +-
.../test/groovy/groovy/xml/VerboseDOMTest.groovy | 24 +--
.../groovy/groovy/xml/bugs/Groovy249_Bug.groovy | 18 +--
.../groovy/groovy/xml/bugs/Groovy4285Bug.groovy | 2 +-
.../groovy/groovy/xml/bugs/StaticMarkupBug.groovy | 2 +-
.../groovy/groovy/xml/script/AtomTestScript.groovy | 2 +-
.../resources/org/apache/groovy/xml/tools/po.xsd | 2 +-
.../org/apache/groovy/xml/tools/swing.xml | 1 -
.../org/apache/groovy/xml/tools/swing2.xml | 1 -
673 files changed, 3307 insertions(+), 3374 deletions(-)
[groovy] 02/02: formatting: remove trailing whitespace on ends of
lines of source files (benchmark files)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 963186cca6207e9e3820c98c9ba08f35b46e9709
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 23 18:21:09 2021 +1000
formatting: remove trailing whitespace on ends of lines of source files (benchmark files)
---
benchmark/bench/ackermann.java | 2 +-
benchmark/bench/fannkuch.groovy | 8 +--
benchmark/bench/fannkuch.java | 24 +++----
benchmark/bench/fasta.java | 6 +-
benchmark/bench/harmonic.java | 6 +-
benchmark/bench/magicsquares.java | 24 +++----
benchmark/bench/meteor.java | 130 +++++++++++++++++++-------------------
benchmark/bench/moments.java | 4 +-
benchmark/bench/pidigits.java | 32 +++++-----
benchmark/bench/process.java | 8 +--
benchmark/bench/regexdna.groovy | 2 +-
benchmark/bench/regexdna.java | 16 ++---
benchmark/bench/revcomp.groovy | 2 +-
benchmark/bench/sumcol.java | 2 +-
benchmark/bench/wordfreq.java | 4 +-
15 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/benchmark/bench/ackermann.java b/benchmark/bench/ackermann.java
index 723d51c..f31cb84 100644
--- a/benchmark/bench/ackermann.java
+++ b/benchmark/bench/ackermann.java
@@ -1,5 +1,5 @@
// $Id: ackermann.java,v 1.2 2005-05-13 16:24:17 igouy-guest Exp $
-// http://www.bagley.org/~doug/shootout/
+// http://www.bagley.org/~doug/shootout/
public class ackermann {
public static void main(String[] args) {
diff --git a/benchmark/bench/fannkuch.groovy b/benchmark/bench/fannkuch.groovy
index bdc012a..3c4b08b 100644
--- a/benchmark/bench/fannkuch.groovy
+++ b/benchmark/bench/fannkuch.groovy
@@ -35,7 +35,7 @@ def fannkuch(int n) {
check++
}
- while (r != 1) {
+ while (r != 1) {
count[r - 1] = r
r--
}
@@ -43,15 +43,15 @@ def fannkuch(int n) {
for (i in 0..<n) {
perm[i] = perm1[i]
}
-
+
int flipsCount = 0
int k
while (!((k = perm[0]) == 0)) {
int k2 = (k + 1) >> 1
for (i in 0..<k2) {
- int temp = perm[i]
- perm[i] = perm[k - i]
+ int temp = perm[i]
+ perm[i] = perm[k - i]
perm[k - i] = temp
}
flipsCount++
diff --git a/benchmark/bench/fannkuch.java b/benchmark/bench/fannkuch.java
index ed06052..92b9d28 100644
--- a/benchmark/bench/fannkuch.java
+++ b/benchmark/bench/fannkuch.java
@@ -15,21 +15,21 @@ public final class fannkuch implements Runnable
private final int n;
private final int[] flip_max_arr;
private final AtomicInteger remain_task = new AtomicInteger(0);
-
+
public static void main(String[] args)
{
int x = (args.length > 0) ? Integer.parseInt(args[0]) : 7;
fannkuch f = new fannkuch(x);
System.out.format("Pfannkuchen(%d) = %d\n", x, f.fank_game());
}
-
+
public fannkuch(int N)
{
n = N;
// hold flip_count result for each swap index
flip_max_arr = new int[n];
}
-
+
private final int fank_game()
{
Thread[] th = new Thread[Runtime.getRuntime().availableProcessors()];
@@ -38,9 +38,9 @@ public final class fannkuch implements Runnable
th[i] = new Thread(this);
th[i].start();
}
-
+
print_30_permut();
-
+
for (Thread t : th)
{
try {
@@ -49,14 +49,14 @@ public final class fannkuch implements Runnable
catch (InterruptedException ie)
{ }
}
-
+
int mx = 0;
for (int i : flip_max_arr)
if (mx < i)
mx = i;
return mx;
}
-
+
// In order to divide tasks 'equally' for many threads, permut generation
// strategy is different than that of original single thread.
// this function will 'correctly' print first 30 permutations
@@ -70,11 +70,11 @@ public final class fannkuch implements Runnable
System.out.print((1 + i));
}
System.out.println();
-
+
final int[] perm_remain = new int[n];
for ( int i = 1; i <= n; i++ )
perm_remain[i -1] = i;
-
+
int numPermutationsPrinted = 1;
for ( int pos_right = 2; pos_right <= n; pos_right++ )
{
@@ -83,7 +83,7 @@ public final class fannkuch implements Runnable
{
// rotate down perm[0..prev] by one
next_perm(permutation, pos_left);
-
+
if (--perm_remain[pos_left] > 0)
{
if (numPermutationsPrinted++ < 30)
@@ -94,7 +94,7 @@ public final class fannkuch implements Runnable
}
else
return;
-
+
for ( ; pos_left != 1; --pos_left)
perm_remain[pos_left -1] = pos_left;
}
@@ -103,7 +103,7 @@ public final class fannkuch implements Runnable
} while (pos_left < pos_right);
}
}
-
+
public void run()
{
final int[] permutation = new int[n];
diff --git a/benchmark/bench/fasta.java b/benchmark/bench/fasta.java
index 0177bd1..3c99a86 100644
--- a/benchmark/bench/fasta.java
+++ b/benchmark/bench/fasta.java
@@ -39,7 +39,7 @@ class fasta {
new frequency('c', 0.12),
new frequency('g', 0.12),
new frequency('t', 0.27),
-
+
new frequency('B', 0.02),
new frequency('D', 0.02),
new frequency('H', 0.02),
@@ -99,7 +99,7 @@ class fasta {
}
if(index != 0) writer.write(bbuffer, 0, index);
}
-
+
static final void makeRepeatFasta(String id, String desc, String alu, int n, OutputStream writer) throws IOException
{
index = 0;
@@ -124,7 +124,7 @@ class fasta {
}
if(index != 0) writer.write(bbuffer, 0, index);
}
-
+
public static void main(String[] args) throws IOException {
makeCumulative(HomoSapiens);
makeCumulative(IUB);
diff --git a/benchmark/bench/harmonic.java b/benchmark/bench/harmonic.java
index e2d7538..72a9b8b 100644
--- a/benchmark/bench/harmonic.java
+++ b/benchmark/bench/harmonic.java
@@ -1,6 +1,6 @@
/* The Great Computer Language Shootout
http://shootout.alioth.debian.org/
-
+
contributed by Paul Lofte
*/
@@ -10,14 +10,14 @@ import java.text.NumberFormat;
public class harmonic {
static final NumberFormat formatter = new DecimalFormat("#.000000000");
-
+
public static void main(String[] args) {
int n = 10000000;
if (args.length > 0) n = Integer.parseInt(args[0]);
double partialSum = 0.0;
for (int i=1; i<=n; i++) partialSum += 1.0/i;
-
+
System.out.println(formatter.format(partialSum));
}
}
diff --git a/benchmark/bench/magicsquares.java b/benchmark/bench/magicsquares.java
index 766991f..3369476 100644
--- a/benchmark/bench/magicsquares.java
+++ b/benchmark/bench/magicsquares.java
@@ -10,10 +10,10 @@ import java.lang.*;
import java.util.*;
public class magicsquares {
-
+
static int n;
static int mn;
-
+
public static class FfmResult {
public int x;
public int y;
@@ -24,13 +24,13 @@ public class magicsquares {
moves = (int[]) imoves.clone();
}
}
-
+
public static class PQNode implements Comparable {
public int [] grid;
boolean priorityCalculated;
private int priority;
private FfmResult ffm;
-
+
public PQNode() {
grid = new int [n * n];
int i;
@@ -75,7 +75,7 @@ public class magicsquares {
public int[] possibleMoves(int x, int y) {
int zerocount, sum, highest, j, i;
-
+
if (grid[x + y * n] != 0)
return ( new int [] { });
ArrayList<int[]> cellGroups = new ArrayList<int[]>();
@@ -150,7 +150,7 @@ public class magicsquares {
ffm = new FfmResult(mx, my, minmoves);
return ffm;
}
-
+
public void calculatePriority()
{
int i, zerocount;
@@ -161,7 +161,7 @@ public class magicsquares {
priority = zerocount + findFewestMoves().moves.length;
priorityCalculated = true;
}
-
+
public int getPriority()
{
if (priorityCalculated)
@@ -171,7 +171,7 @@ public class magicsquares {
return priority;
}
}
-
+
public int compareTo(Object anotherMSquare) throws ClassCastException {
if (!(anotherMSquare instanceof PQNode))
throw new ClassCastException();
@@ -202,11 +202,11 @@ public class magicsquares {
return sb.toString();
}
-
+
}
-
+
public magicsquares() { }
-
+
public static void main(String[] args) {
n = 3;
if (args.length > 0)
@@ -229,6 +229,6 @@ public class magicsquares {
pq.offer(newSquare);
}
}
-
+
}
}
diff --git a/benchmark/bench/meteor.java b/benchmark/bench/meteor.java
index b5a46b7..a72fd32 100644
--- a/benchmark/bench/meteor.java
+++ b/benchmark/bench/meteor.java
@@ -25,10 +25,10 @@ import java.util.TreeSet;
* @author Tony Seebregts
*
*/
-
+
public class meteor
{ // CONSTANTS
-
+
private static final int[] SHIFT = { 0,6,11,17,22,28,33,39,44,50 };
private static final long[][] MASK = { { 0x01L, 0x02L, 0x04L, 0x08L, 0x10L },
{ 0x01L << 6, 0x02L << 6, 0x04L << 6, 0x08L << 6,0x10L << 6 },
@@ -41,13 +41,13 @@ public class meteor
{ 0x01L << 44,0x02L << 44,0x04L << 44,0x08L << 44,0x10L << 44 },
{ 0x01L << 50,0x02L << 50,0x04L << 50,0x08L << 50,0x10L << 50 }
};
-
+
private static final boolean DEBUG = false;
// CLASS VARIABLES
-
+
// INSTANCE VARIABLES
-
+
private SortedSet<String> solutions = new TreeSet<String>();
private Entry[] solution = new Entry[10];
private int depth = 0;
@@ -62,7 +62,7 @@ public class meteor
new Piece(PIECE8),
new Piece(PIECE9)
};
-
+
// CLASS METHODS
/** Application entry point.
@@ -72,31 +72,31 @@ public class meteor
* <li> solution limit
* </ul>
*/
-
+
public static void main(String[] args)
{ int N = 2098;
-
+
// ... parse command line arguments
-
+
if (args.length > 0)
if (args[0].matches("\\d+"))
N = Integer.parseInt(args[0]);
-
+
// ... solve puzzle
-
+
meteor puzzle = new meteor ();
Date start;
Date end;
long time;
SortedSet<String> solutions;
-
+
start = new Date();
solutions = puzzle.solve();
end = new Date();
time = end.getTime() - start.getTime();
-
+
// ... print result
-
+
if (solutions.size() > N)
System.out.println("ERROR");
else if (solutions.size() < N)
@@ -111,7 +111,7 @@ public class meteor
System.out.println("LAST : " + solutions.last ());
System.out.println();
}
-
+
System.out.print(solutions.size () + " solutions found\n\n");
print(solutions.first());
System.out.print("\n");
@@ -124,7 +124,7 @@ public class meteor
*
*
*/
-
+
private static void print (String solution)
{ System.out.print(solution.replaceAll("(\\d{5})(\\d{5})","$1 $2")
.replaceAll("(\\d{5})","$1\n")
@@ -132,7 +132,7 @@ public class meteor
}
// CONSTRUCTORS
-
+
/** Initialises the puzzle.
*
*/
@@ -141,20 +141,20 @@ public class meteor
{ for (int i=0; i<10; i++)
solution[i] = new Entry();
}
-
+
// INSTANCE METHODS
-
+
/** Initialises the puzzle and solution set at [0,0]
*
* @return Sorted list of solution strings.
*/
-
+
private SortedSet<String> solve()
{ solve(0x0002004008010020L,0,0);
-
+
return solutions;
}
-
+
/** Recursively solves the puzzle by fitting pieces into the
* next available hexagon.
*
@@ -163,122 +163,122 @@ public class meteor
* @param col Column next available hexagon.
*
*/
-
+
private void solve (long puzzle,int row,int col)
{ for (int ix=0; ix<pieces.length; ix++)
{ Piece piece;
Shape[] list;
-
+
// ... find shapes that fit
-
+
if ((piece = pieces[ix]) == null)
continue;
else
list = pieces[ix].shapes(row,col);
-
+
for (Shape shape: list)
{ // ... fits badly ?
-
+
if ((shape.bitmap & puzzle) != 0)
continue;
-
+
// ... try piece in puzzle
-
+
long clone = puzzle | shape.bitmap;
-
+
// ... find next position
-
+
int irow = row;
int icol = col/2 + 1;
-
+
next:
while (irow < 10)
{ while (icol < 5)
{ if ((clone & MASK[irow][icol]) == 0)
break next;
-
+
icol++;
}
-
+
irow++;
icol = 0;
}
-
+
// ... solve next
-
+
Entry entry;
-
+
pieces[ix] = null;
entry = solution[depth++];
entry.row = row;
entry.col = col;
entry.shape = shape;
-
+
if (depth == 10)
solutions.add(serialize(solution));
else
solve (clone,irow,2*icol + (irow % 2));
-
+
depth--;
pieces[ix] = piece;
}
}
}
-
+
/** Serializes the current solution to a string.
*
*/
-
+
private String serialize (Entry[] solution)
{ char[] puzzle = new char[50];
Shape shape;
int row;
int col;
-
+
for (Entry entry: solution)
{ shape = entry.shape;
row = entry.row;
col = entry.col;
-
+
for (int[] xy: shape.vector)
puzzle[5 * (row + xy[0]) + (col + xy[1])/2] = shape.symbol;
}
-
+
return new String(puzzle);
}
-
+
// INNER CLASSES
-
+
/** Container class for a solution set entry.
*
*/
-
+
private static class Entry
{ public int row;
public int col;
public Shape shape;
}
-
+
/** Container class for the shapes for a single puzzle piece.
*
*
*/
-
+
private static class Piece
{ private Shape[][][] shapes = new Shape[10][10][];
-
+
@SuppressWarnings("unchecked")
private Piece (Shape[] list)
{ // ... initialise
-
+
ArrayList[][] array = new ArrayList[10][10];
-
+
for (int i=0; i<10; i++)
for (int j=0; j<10; j++)
array[i][j] = new ArrayList<Shape>();
-
+
// ... generate list
-
+
for (Shape mutant: list)
for (int row=0; row<=mutant.maxRow; row++)
for (int col=mutant.minCol; col<=mutant.maxCol; col++)
@@ -287,35 +287,35 @@ public class meteor
else if ((row != 0) || (col != 0))
array[row][col].add(new Shape(mutant,row,col));
}
-
+
for (int row=0; row<10; row++)
for (int col=0; col<10; col++)
shapes[row][col] = (Shape[]) array[row][col].toArray(new Shape[0]);
}
-
+
@SuppressWarnings("unchecked")
private Shape[] shapes(int row,int col)
{ return shapes[row][col];
}
-
+
}
/** Container class for the shape vector and bitmap single puzzle piece mutation.
*
*
*/
-
+
private static class Shape
{ private char symbol;
private int[][] vector;
private long bitmap;
private int shift;
-
+
private boolean islet;
private int maxRow;
private int minCol;
private int maxCol;
-
+
private Shape (char symbol,
int[][] vector,
long bitmap,
@@ -328,27 +328,27 @@ public class meteor
this.vector = vector;
this.bitmap = bitmap;
this.shift = shift;
-
+
this.islet = islet;
this.maxRow = maxRow;
this.minCol = minCol;
this.maxCol = maxCol;
}
-
+
private Shape (Shape shape,
int row,
int col)
{ this.symbol = shape.symbol;
this.vector = shape.vector;
this.bitmap = shape.bitmap << ((SHIFT[row] + (col - (row % 2))/2) - shape.shift);
-
+
this.islet = shape.islet;
this.maxRow = shape.maxRow;
this.minCol = shape.minCol;
this.maxCol = shape.maxCol;
}
}
-
+
// PIECES
private static final Shape[] PIECE0 = { new Shape ('0',new int[][] {{3, 5},{2, 4},{1, 3},{0, 2},{0, 0}},0x0000000000082083L,0,false,6,0,4),
@@ -490,5 +490,5 @@ public class meteor
new Shape ('9',new int[][] {{3,-1},{2, 0},{1, 1},{0, 2},{0, 0}},0x0000000000021086L,1,false,6,1,7),
new Shape ('9',new int[][] {{1,-5},{1,-3},{1,-1},{1, 1},{0, 0}},0x00000000000003C8L,3,false,8,5,8)
};
-
+
}
diff --git a/benchmark/bench/moments.java b/benchmark/bench/moments.java
index 7f08dd1..ff6b090 100644
--- a/benchmark/bench/moments.java
+++ b/benchmark/bench/moments.java
@@ -49,7 +49,7 @@ public class moments {
skew /= (n * variance * standard_deviation);
kurtosis = kurtosis/(n * variance * variance) - 3.0;
}
-
+
Collections.sort(nums);
mid = (n/2);
@@ -57,7 +57,7 @@ public class moments {
((Double)nums.get(mid)).doubleValue() :
(((Double)nums.get(mid)).doubleValue() +
((Double)nums.get(mid-1)).doubleValue())/2;
-
+
NumberFormat nf = NumberFormat.getInstance();
nf.setMaximumFractionDigits(13);
nf.setGroupingUsed(false);
diff --git a/benchmark/bench/pidigits.java b/benchmark/bench/pidigits.java
index b426f15..2fcdcff 100644
--- a/benchmark/bench/pidigits.java
+++ b/benchmark/bench/pidigits.java
@@ -1,6 +1,6 @@
/* The Great Computer Language Shootout
http://shootout.alioth.debian.org/
-
+
contributed by Isaac Gouy
*/
@@ -12,9 +12,9 @@ public class pidigits {
public static void main(String args[]) {
int n = Integer.parseInt(args[0]);
int j = 0;
-
+
PiDigitSpigot digits = new PiDigitSpigot();
-
+
while (n > 0){
if (n >= L){
for (int i=0; i<L; i++) System.out.print( digits.next() );
@@ -33,13 +33,13 @@ public class pidigits {
class PiDigitSpigot {
Transformation z, x, inverse;
-
+
public PiDigitSpigot(){
z = new Transformation(1,0,0,1);
x = new Transformation(0,0,0,0);
inverse = new Transformation(0,0,0,0);
}
-
+
public int next(){
int y = digit();
if (isSafe(y)){
@@ -48,19 +48,19 @@ class PiDigitSpigot {
z = consume( x.next() ); return next();
}
}
-
+
public int digit(){
return z.extract(3);
}
-
+
public boolean isSafe(int digit){
return digit == z.extract(4);
}
-
+
public Transformation produce(int i){
return ( inverse.qrst(10,-10*i,0,1) ).compose(z);
}
-
+
public Transformation consume(Transformation a){
return z.compose(a);
}
@@ -70,7 +70,7 @@ class PiDigitSpigot {
class Transformation {
BigInteger q, r, s, t;
int k;
-
+
public Transformation(int q, int r, int s, int t){
this.q = BigInteger.valueOf(q);
this.r = BigInteger.valueOf(r);
@@ -78,7 +78,7 @@ class Transformation {
this.t = BigInteger.valueOf(t);
k = 0;
}
-
+
public Transformation(BigInteger q, BigInteger r, BigInteger s, BigInteger t){
this.q = q;
this.r = r;
@@ -86,7 +86,7 @@ class Transformation {
this.t = t;
k = 0;
}
-
+
public Transformation next(){
k++;
q = BigInteger.valueOf(k);
@@ -95,14 +95,14 @@ class Transformation {
t = BigInteger.valueOf(2 * k + 1);
return this;
}
-
+
public int extract(int j){
BigInteger bigj = BigInteger.valueOf(j);
BigInteger numerator = (q.multiply(bigj)).add(r);
BigInteger denominator = (s.multiply(bigj)).add(t);
return ( numerator.divide(denominator) ).intValue();
}
-
+
public Transformation qrst(int q, int r, int s, int t){
this.q = BigInteger.valueOf(q);
this.r = BigInteger.valueOf(r);
@@ -111,7 +111,7 @@ class Transformation {
k = 0;
return this;
}
-
+
public Transformation compose(Transformation a){
return new Transformation(
q.multiply(a.q)
@@ -123,4 +123,4 @@ class Transformation {
}
-
+
diff --git a/benchmark/bench/process.java b/benchmark/bench/process.java
index 86d19a8..f0b5f87 100644
--- a/benchmark/bench/process.java
+++ b/benchmark/bench/process.java
@@ -1,6 +1,6 @@
/* The Great Computer Language Shootout
http://shootout.alioth.debian.org/
-
+
contributed by Isaac Gouy
*/
@@ -13,7 +13,7 @@ public class process {
EndLink chainEnd = new EndLink(null, n);
chainEnd.start();
Link chain = chainEnd;
-
+
for (int i=2; i<=n; i++){
Link link = new Link(chain);
link.start();
@@ -33,7 +33,7 @@ class Link extends Thread {
Link next;
int message = -1;
boolean busy = false;
-
+
Link(Link t){
next = t;
}
@@ -70,7 +70,7 @@ class Link extends Thread {
class EndLink extends Link {
public int count = 0;
private int finalcount;
-
+
EndLink(Link t, int i){
super(t);
finalcount = i;
diff --git a/benchmark/bench/regexdna.groovy b/benchmark/bench/regexdna.groovy
index 6cfd102..403e412 100644
--- a/benchmark/bench/regexdna.groovy
+++ b/benchmark/bench/regexdna.groovy
@@ -39,7 +39,7 @@ codeLength = seq.length()
V: '(a|c|g)',
W: '(a|t)',
Y: '(c|t)'
-].each { f, r ->
+].each { f, r ->
seq = (seq =~ f).replaceAll(r)
}
diff --git a/benchmark/bench/regexdna.java b/benchmark/bench/regexdna.java
index 4487eec..24e748f 100644
--- a/benchmark/bench/regexdna.java
+++ b/benchmark/bench/regexdna.java
@@ -10,7 +10,7 @@ import java.lang.*;
import java.util.regex.*;
public class regexdna {
-
+
public regexdna() {
}
@@ -20,19 +20,19 @@ public class regexdna {
char[] cbuf = new char[10240];
int charsRead = 0;
try {
- while ((charsRead = r.read(cbuf, 0, 10240)) != -1)
+ while ((charsRead = r.read(cbuf, 0, 10240)) != -1)
sb.append(cbuf, 0, charsRead);
} catch (java.io.IOException e) {
return;
}
String sequence = sb.toString();
-
+
int initialLength = sequence.length();
sequence = Pattern.compile(">.*\n|\n").matcher(sequence).replaceAll("");
int codeLength = sequence.length();
-
- String[] variants = { "agggtaaa|tttaccct" ,"[cgt]gggtaaa|tttaccc[acg]", "a[act]ggtaaa|tttacc[agt]t",
- "ag[act]gtaaa|tttac[agt]ct", "agg[act]taaa|ttta[agt]cct", "aggg[acg]aaa|ttt[cgt]ccct",
+
+ String[] variants = { "agggtaaa|tttaccct" ,"[cgt]gggtaaa|tttaccc[acg]", "a[act]ggtaaa|tttacc[agt]t",
+ "ag[act]gtaaa|tttac[agt]ct", "agg[act]taaa|ttta[agt]cct", "aggg[acg]aaa|ttt[cgt]ccct",
"agggt[cgt]aa|tt[acg]accct", "agggta[cgt]a|t[acg]taccct", "agggtaa[cgt]|[acg]ttaccct" };
for (int i = 0; i < variants.length; i++) {
int count = 0;
@@ -41,7 +41,7 @@ public class regexdna {
count++;
System.out.println(variants[i] + " " + count);
}
-
+
sequence = Pattern.compile("B").matcher(sequence).replaceAll("(c|g|t)");
sequence = Pattern.compile("D").matcher(sequence).replaceAll("(a|g|t)");
sequence = Pattern.compile("H").matcher(sequence).replaceAll("(a|c|t)");
@@ -53,7 +53,7 @@ public class regexdna {
sequence = Pattern.compile("V").matcher(sequence).replaceAll("(a|c|g)");
sequence = Pattern.compile("W").matcher(sequence).replaceAll("(a|t)");
sequence = Pattern.compile("Y").matcher(sequence).replaceAll("(c|t)");
-
+
System.out.println();
System.out.println(initialLength);
System.out.println(codeLength);
diff --git a/benchmark/bench/revcomp.groovy b/benchmark/bench/revcomp.groovy
index 2aec7c4..c682cda 100644
--- a/benchmark/bench/revcomp.groovy
+++ b/benchmark/bench/revcomp.groovy
@@ -2,7 +2,7 @@
* The Computer Language Benchmarks Game
* http://shootout.alioth.debian.org/
*
- * contributed by James Durbin
+ * contributed by James Durbin
* slightly modified from Java version from
* Anthony Donnefort and Razii
*/
diff --git a/benchmark/bench/sumcol.java b/benchmark/bench/sumcol.java
index b79c505..16b071c 100644
--- a/benchmark/bench/sumcol.java
+++ b/benchmark/bench/sumcol.java
@@ -1,5 +1,5 @@
// $Id: sumcol.java,v 1.5 2007-06-20 03:32:39 bfulgham Exp $
-// http://www.bagley.org/~doug/shootout/
+// http://www.bagley.org/~doug/shootout/
import java.io.*;
import java.util.*;
diff --git a/benchmark/bench/wordfreq.java b/benchmark/bench/wordfreq.java
index e8ae4a3..316e8c2 100644
--- a/benchmark/bench/wordfreq.java
+++ b/benchmark/bench/wordfreq.java
@@ -33,7 +33,7 @@ public class wordfreq {
map.put(token, new Counter());
}
}
-
+
ArrayList list = new ArrayList(map.entrySet());
Collections.sort(list, new Comparator() {
public int compare(Object o1, Object o2) {
@@ -44,7 +44,7 @@ public class wordfreq {
return c;
}
});
-
+
String[] padding = { "error!", " ", " ", " ", " ", " ", " ", "error!" };
StringBuffer output = new StringBuffer();
Iterator it = list.iterator();
[groovy] 01/02: formatting: remove trailing whitespace on ends of
lines of source files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 52c9ae912b8bd3b7cc27b68ec7611647952de989
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 23 18:20:47 2021 +1000
formatting: remove trailing whitespace on ends of lines of source files
---
CONTRIBUTING.md | 2 +-
DOAP.rdf | 8 +-
README.adoc | 2 +-
benchmark/bench.groovy | 6 +-
...rg.apache.groovy-bad-practices-detection.gradle | 2 +-
.../groovy/org.apache.groovy-stresstest.gradle | 1 -
.../gradle/WriteExtensionDescriptorTask.groovy | 2 -
config/codenarc/codenarc.groovy | 66 ++++----
gradle/build-scans.gradle | 12 +-
security/groovy.policy | 8 +-
src/bin/java2groovy.bat | 4 +-
src/bin/startGroovy | 4 +-
src/main/groovy/groovy/beans/ListenerList.groovy | 4 +-
src/main/groovy/groovy/transform/Canonical.groovy | 8 +-
.../codehaus/groovy/ast/builder/AstBuilder.groovy | 13 +-
.../ast/builder/AstSpecificationCompiler.groovy | 1 -
.../customizers/ASTTransformationCustomizer.groovy | 1 -
.../groovy/tools/ast/TransformTestHelper.groovy | 2 +-
src/main/java/groovy/beans/Bindable.java | 34 ++--
src/main/java/groovy/beans/Vetoable.java | 34 ++--
.../java/groovy/lang/BenchmarkInterceptor.java | 16 +-
src/main/java/groovy/lang/Binding.java | 6 +-
src/main/java/groovy/lang/ClosureException.java | 2 +-
src/main/java/groovy/lang/GroovySystem.java | 10 +-
.../lang/IllegalPropertyAccessException.java | 6 +-
src/main/java/groovy/lang/MetaClass.java | 6 +-
src/main/java/groovy/lang/MetaClassRegistry.java | 16 +-
.../lang/MetaClassRegistryChangeEventListener.java | 2 +-
src/main/java/groovy/lang/MetaMethod.java | 8 +-
src/main/java/groovy/lang/MetaObjectProtocol.java | 5 +-
.../java/groovy/lang/MissingClassException.java | 2 +-
.../java/groovy/lang/MissingFieldException.java | 1 -
src/main/java/groovy/lang/MutableMetaClass.java | 2 +-
src/main/java/groovy/lang/PropertyValue.java | 1 -
.../groovy/lang/ReadOnlyPropertyException.java | 1 -
src/main/java/groovy/lang/SpreadMap.java | 2 +-
src/main/java/groovy/lang/Tuple10.java | 1 -
src/main/java/groovy/lang/Tuple11.java | 1 -
src/main/java/groovy/lang/Tuple12.java | 2 -
src/main/java/groovy/lang/Tuple13.java | 2 -
src/main/java/groovy/lang/Tuple14.java | 1 -
src/main/java/groovy/lang/Tuple15.java | 1 -
src/main/java/groovy/lang/Tuple16.java | 1 -
src/main/java/groovy/lang/Writable.java | 2 +-
src/main/java/groovy/namespace/QName.java | 2 +-
src/main/java/groovy/time/Duration.java | 20 +--
.../groovy/time/TimeDatumDependentDuration.java | 12 +-
src/main/java/groovy/time/TimeDuration.java | 16 +-
src/main/java/groovy/time/package.html | 4 +-
.../java/groovy/transform/AnnotationCollector.java | 34 ++--
src/main/java/groovy/transform/BaseScript.java | 4 +-
.../java/groovy/transform/InheritConstructors.java | 2 +-
src/main/java/groovy/transform/Memoized.java | 4 +-
src/main/java/groovy/transform/Synchronized.java | 4 +-
src/main/java/groovy/transform/ToString.java | 10 +-
src/main/java/groovy/transform/WithWriteLock.java | 6 +-
.../groovy/transform/stc/MapEntryOrKeyValue.java | 6 +-
src/main/java/groovy/ui/GroovySocketServer.java | 28 ++--
src/main/java/groovy/util/Eval.java | 22 +--
.../java/groovy/util/FactoryBuilderSupport.java | 2 +-
src/main/java/groovy/util/NodeBuilder.java | 2 +-
src/main/java/groovy/util/ObjectGraphBuilder.java | 2 +-
src/main/java/groovy/util/Proxy.java | 2 +-
.../apache/groovy/parser/antlr4/AstBuilder.java | 3 -
.../antlr4/TryWithResourcesASTTransformation.java | 1 -
.../antlr4/internal/DescriptiveErrorStrategy.java | 1 -
.../antlr4/internal/atnmanager/AtnManager.java | 1 -
.../concurrentlinkedhashmap/LinkedDeque.java | 1 -
.../codehaus/groovy/GroovyExceptionInterface.java | 2 +-
.../java/org/codehaus/groovy/antlr/EnumHelper.java | 6 +-
.../org/codehaus/groovy/ast/InnerClassNode.java | 6 +-
.../groovy/ast/InterfaceHelperClassNode.java | 6 +-
.../java/org/codehaus/groovy/ast/MixinNode.java | 2 +-
.../java/org/codehaus/groovy/ast/Variable.java | 12 +-
.../groovy/ast/expr/ArgumentListExpression.java | 6 +-
.../groovy/ast/expr/BooleanExpression.java | 4 +-
.../codehaus/groovy/ast/expr/ClassExpression.java | 4 +-
.../groovy/ast/expr/ClosureListExpression.java | 20 +--
.../groovy/ast/expr/ElvisOperatorExpression.java | 4 +-
.../org/codehaus/groovy/ast/expr/Expression.java | 6 +-
.../groovy/ast/expr/ExpressionTransformer.java | 2 +-
.../groovy/ast/expr/GStringExpression.java | 2 +-
.../ast/expr/NamedArgumentListExpression.java | 4 +-
.../groovy/ast/expr/PostfixExpression.java | 2 +-
.../groovy/ast/expr/TernaryExpression.java | 2 +-
.../codehaus/groovy/ast/stmt/BlockStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/BreakStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/CaseStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/CatchStatement.java | 6 +-
.../groovy/ast/stmt/ContinueStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/DoWhileStatement.java | 6 +-
.../org/codehaus/groovy/ast/stmt/ForStatement.java | 14 +-
.../org/codehaus/groovy/ast/stmt/IfStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/LoopingStatement.java | 8 +-
.../codehaus/groovy/ast/stmt/SwitchStatement.java | 6 +-
.../groovy/ast/stmt/SynchronizedStatement.java | 6 +-
.../codehaus/groovy/ast/stmt/ThrowStatement.java | 4 +-
.../groovy/ast/stmt/TryCatchStatement.java | 4 +-
.../codehaus/groovy/classgen/GeneratorContext.java | 2 +-
.../groovy/classgen/asm/AssertionWriter.java | 34 ++--
.../asm/BinaryBooleanExpressionHelper.java | 20 +--
.../classgen/asm/BinaryDoubleExpressionHelper.java | 14 +-
.../classgen/asm/BinaryExpressionWriter.java | 58 +++----
.../classgen/asm/BinaryFloatExpressionHelper.java | 32 ++--
.../classgen/asm/BinaryIntExpressionHelper.java | 34 ++--
.../classgen/asm/BinaryLongExpressionHelper.java | 4 +-
.../classgen/asm/BinaryObjectExpressionHelper.java | 20 +--
.../groovy/classgen/asm/BytecodeVariable.java | 10 +-
.../groovy/classgen/asm/CallSiteWriter.java | 26 ++--
.../classgen/asm/ExpressionAsVariableSlot.java | 2 +-
.../groovy/classgen/asm/VariableSlotLoader.java | 6 +-
.../classgen/asm/indy/IndyCallSiteWriter.java | 6 +-
.../classgen/asm/indy/InvokeDynamicWriter.java | 16 +-
.../org/codehaus/groovy/classgen/asm/package.html | 2 +-
.../asm/sc/StaticTypesWriterController.java | 6 +-
.../codehaus/groovy/control/ClassNodeResolver.java | 40 ++---
.../org/codehaus/groovy/control/CompilePhase.java | 46 +++---
.../MultipleCompilationErrorsException.java | 4 +-
.../groovy/control/io/FileReaderSource.java | 4 +-
.../org/codehaus/groovy/control/io/NullWriter.java | 6 +-
.../codehaus/groovy/control/io/ReaderSource.java | 6 +-
.../groovy/control/io/StringReaderSource.java | 4 +-
.../groovy/control/io/URLReaderSource.java | 4 +-
.../groovy/reflection/CachedConstructor.java | 2 +-
.../codehaus/groovy/reflection/CachedMethod.java | 8 +-
.../groovy/reflection/ReflectionCache.java | 4 +-
.../reflection/stdclasses/BooleanCachedClass.java | 2 +-
.../reflection/stdclasses/CachedSAMClass.java | 4 +-
.../reflection/stdclasses/LongCachedClass.java | 1 -
.../org/codehaus/groovy/runtime/ArrayUtil.java | 6 +-
.../groovy/runtime/BytecodeInterface8.java | 96 ++++++------
.../codehaus/groovy/runtime/ConvertedClosure.java | 2 +-
.../groovy/runtime/IteratorClosureAdapter.java | 4 +-
.../org/codehaus/groovy/runtime/MethodKey.java | 4 +-
.../codehaus/groovy/runtime/MethodRankHelper.java | 30 ++--
.../org/codehaus/groovy/runtime/NullObject.java | 4 +-
.../groovy/runtime/StreamGroovyMethods.java | 2 +-
.../runtime/callsite/BooleanClosureWrapper.java | 4 +-
.../callsite/BooleanReturningMethodInvoker.java | 8 +-
.../groovy/runtime/callsite/ConstructorSite.java | 2 +-
.../groovy/runtime/callsite/NullCallSite.java | 2 +-
.../groovy/runtime/dgmimpl/NumberNumberMinus.java | 1 -
.../runtime/memoize/LRUProtectionStorage.java | 2 +-
.../codehaus/groovy/runtime/memoize/Memoize.java | 8 +-
.../runtime/metaclass/ClosureStaticMetaMethod.java | 2 +-
.../runtime/metaclass/ConcurrentReaderHashMap.java | 52 +++----
.../runtime/metaclass/DefaultMetaClassInfo.java | 82 +++++-----
.../groovy/runtime/metaclass/MethodHelper.java | 2 +-
.../runtime/metaclass/MethodMetaProperty.java | 8 +-
.../metaclass/MethodSelectionException.java | 8 +-
.../groovy/runtime/metaclass/ReflectorLoader.java | 10 +-
.../metaclass/ThreadManagedMetaBeanProperty.java | 2 +-
.../runtime/typehandling/BigIntegerMath.java | 12 +-
.../runtime/typehandling/FloatingPointMath.java | 10 +-
.../groovy/runtime/typehandling/IntegerMath.java | 8 +-
.../groovy/runtime/typehandling/LongMath.java | 16 +-
.../java/org/codehaus/groovy/syntax/ASTHelper.java | 2 +-
.../org/codehaus/groovy/tools/GroovyStarter.java | 14 +-
.../java/org/codehaus/groovy/tools/Utilities.java | 2 +-
.../groovy/tools/gse/DependencyTracker.java | 4 +-
.../codehaus/groovy/tools/gse/StringSetMap.java | 6 +-
.../codehaus/groovy/tools/shell/util/Logger.java | 12 +-
.../groovy/tools/shell/util/MessageSource.java | 50 +++---
.../groovy/tools/shell/util/Preferences.java | 2 +-
.../transformers/BooleanExpressionTransformer.java | 2 +-
.../groovy/transform/stc/ExtensionMethodNode.java | 2 +-
.../org/codehaus/groovy/util/LazyReference.java | 4 +-
.../groovy/util/ManagedConcurrentValueMap.java | 4 +-
.../org/codehaus/groovy/util/ManagedReference.java | 12 +-
.../org/codehaus/groovy/util/ReferenceBundle.java | 2 +-
.../org/codehaus/groovy/util/ReferenceManager.java | 12 +-
.../org/codehaus/groovy/util/ReferenceType.java | 10 +-
.../java/org/codehaus/groovy/util/ReleaseInfo.java | 6 +-
src/spec/doc/_design-pattern-flyweight.adoc | 1 -
src/spec/doc/_design-pattern-loan-my-resource.adoc | 1 -
src/spec/doc/_design-pattern-proxy.adoc | 1 -
src/spec/doc/_design-pattern-state.adoc | 1 -
src/spec/doc/_design-pattern-visitor.adoc | 1 -
src/spec/doc/core-domain-specific-languages.adoc | 2 +-
src/spec/doc/design-patterns-in-groovy.adoc | 3 +-
src/spec/test/ClassTest.groovy | 2 +-
.../CompilerDirectivesASTTransformsTest.groovy | 4 +-
.../DeclarativeConcurrencyASTTransformsTest.groovy | 2 +-
src/spec/test/DesignPatternsTest.groovy | 42 ++---
src/spec/test/PackageTest.groovy | 54 +++----
src/spec/test/SyntaxTest.groovy | 16 +-
src/spec/test/builder/FileTreeBuilderTest.groovy | 6 +-
src/spec/test/builder/NodeBuilderTest.groovy | 2 +-
.../test/gdk/WorkingWithCollectionsTest.groovy | 2 +-
.../test/metaprogramming/GroovyObjectTest.groovy | 18 +--
.../InterceptionThroughMetaClassTest.groovy | 4 +-
.../MethodPropertyMissingTest.groovy | 2 +-
src/spec/test/semantics/OptionalityTest.groovy | 12 +-
src/spec/test/semantics/TheGroovyTruthTest.groovy | 18 +--
.../typing/TypeCheckingExtensionSpecTest.groovy | 8 +-
src/tck/test/gls/ch03/s01/Unicode1.groovy | 4 +-
src/tck/test/gls/ch03/s01/Unicode2.groovy | 2 +-
src/tck/test/gls/ch03/s02/Longest1.groovy | 8 +-
src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy | 8 +-
src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy | 16 +-
src/test-resources/bugs/BUG-GROOVY-8426.groovy | 2 +-
src/test-resources/core/Command_04.groovy | 1 -
src/test-resources/core/List_01.groovy | 2 +-
src/test/gls/annotations/AnnotationTest.groovy | 14 +-
.../gls/annotations/AnnotationsInfoTest.groovy | 6 +-
.../closures/AnnotationClosureTest.groovy | 4 +-
.../AnnotationClosureWithNonLocalVariable.groovy | 6 +-
src/test/gls/ch06/s05/GName1Test.groovy | 76 ++++-----
src/test/gls/generics/GenericsBytecodeTest.groovy | 2 +-
.../gls/invocation/ClosureDelegationTest.groovy | 4 +-
src/test/gls/invocation/CovariantReturnTest.groovy | 6 +-
.../invocation/GroovyObjectInheritanceTest.groovy | 20 +--
src/test/gls/invocation/MethodSelectionTest.groovy | 72 ++++-----
.../invocation/StaticMethodInvocationTest.groovy | 8 +-
src/test/gls/scope/NameResolvingTest.groovy | 4 +-
src/test/gls/scope/StaticScopeTest.groovy | 8 +-
src/test/gls/sizelimits/StringSizeTest.groovy | 10 +-
.../MultipleAssignmentDeclarationTest.groovy | 18 +--
src/test/gls/statements/ReturnTest.groovy | 2 +-
src/test/gls/syntax/AssertTest.groovy | 2 +-
src/test/gls/syntax/Gep3Test.groovy | 22 +--
src/test/gls/syntax/ParsingTest.groovy | 6 +-
.../types/BooleanExpressionConversionTest.groovy | 14 +-
src/test/gls/types/GroovyCastTest.groovy | 6 +-
.../groovy/AbstractClassAndInterfaceTest.groovy | 56 +++----
src/test/groovy/ActorTest.groovy | 2 +-
src/test/groovy/ArrayAutoboxingTest.groovy | 8 +-
src/test/groovy/ArrayParamMethodTest.groovy | 8 +-
src/test/groovy/AsTest.groovy | 8 +-
src/test/groovy/Bar.groovy | 2 +-
src/test/groovy/BindingTest.groovy | 16 +-
src/test/groovy/CastTest.groovy | 48 +++---
src/test/groovy/ClassExpressionTest.groovy | 18 +--
src/test/groovy/ClassLoaderBug.groovy | 2 +-
src/test/groovy/ClassTest.groovy | 4 +-
src/test/groovy/ClosureDefaultParameterTest.groovy | 2 +-
src/test/groovy/ClosureMethodCallTest.groovy | 2 +-
.../ClosureReturnWithoutReturnStatementTest.groovy | 4 +-
src/test/groovy/CompareToTest.groovy | 12 +-
src/test/groovy/CompareTypesTest.groovy | 64 ++++----
src/test/groovy/DefaultParamClosureTest.groovy | 8 +-
src/test/groovy/DoWhileLoopTest.groovy | 2 +-
src/test/groovy/DollarEscapingTest.groovy | 6 +-
src/test/groovy/DynamicMemberTest.groovy | 10 +-
src/test/groovy/Foo.groovy | 8 +-
src/test/groovy/ForLoopTest.groovy | 2 +-
src/test/groovy/GStringTest.groovy | 2 +-
src/test/groovy/GlobalPrintlnTest.groovy | 2 +-
src/test/groovy/GroovyMethodsTest.groovy | 18 +--
src/test/groovy/GroovyTruthTest.groovy | 4 +-
src/test/groovy/HeredocsTest.groovy | 4 +-
src/test/groovy/IdentityClosureTest.groovy | 8 +-
src/test/groovy/InstanceofTest.groovy | 16 +-
src/test/groovy/ListIteratingTest.groovy | 8 +-
src/test/groovy/LocalPropertyTest.groovy | 8 +-
src/test/groovy/LocalVariableTest.groovy | 4 +-
src/test/groovy/LogicTest.groovy | 16 +-
src/test/groovy/LoopBreakTest.groovy | 2 +-
src/test/groovy/MapTest.groovy | 10 +-
.../groovy/MethodCallWithoutParenthesisTest.groovy | 18 +--
src/test/groovy/MinusEqualsTest.groovy | 24 +--
src/test/groovy/MultilineStringTest.groovy | 2 +-
src/test/groovy/MultiplyDivideEqualsTest.groovy | 42 ++---
src/test/groovy/NewExpressionTest.groovy | 6 +-
src/test/groovy/NullPropertyTest.groovy | 4 +-
src/test/groovy/OverloadInvokeMethodTest.groovy | 4 +-
src/test/groovy/OverridePropertyGetterTest.groovy | 2 +-
src/test/groovy/PlusEqualsTest.groovy | 28 ++--
src/test/groovy/PostfixTest.groovy | 20 +--
src/test/groovy/PrefixTest.groovy | 26 ++--
src/test/groovy/PrimitiveArraysTest.groovy | 30 ++--
src/test/groovy/PrimitiveTypesTest.groovy | 22 +--
src/test/groovy/PrintTest.groovy | 10 +-
...ateVariableAccessFromAnotherInstanceTest.groovy | 4 +-
src/test/groovy/ProcessTest.groovy | 2 +-
src/test/groovy/PropertyTest.groovy | 8 +-
src/test/groovy/PropertyWithoutDotTest.groovy | 4 +-
src/test/groovy/SafeNavigationTest.groovy | 2 +-
src/test/groovy/SerializeTest.groovy | 4 +-
src/test/groovy/ShellTest.groovy | 16 +-
src/test/groovy/SingletonBugTest.groovy | 8 +-
src/test/groovy/SqlDateTest.groovy | 10 +-
src/test/groovy/StaticImportTest.groovy | 2 +-
src/test/groovy/SubscriptTest.groovy | 104 ++++++-------
src/test/groovy/ToArrayBugTest.groovy | 14 +-
src/test/groovy/UnsafeNavigationTest.groovy | 2 +-
src/test/groovy/VArgsTest.groovy | 52 +++----
src/test/groovy/VerbatimGStringTest.groovy | 14 +-
src/test/groovy/bugs/ArrayMethodCallBug.groovy | 4 +-
.../bugs/AssignmentInsideExpressionBug.groovy | 6 +-
.../bugs/BadLineNumberOnExceptionBugTest.groovy | 2 +-
src/test/groovy/bugs/BenchmarkBug.groovy | 4 +-
src/test/groovy/bugs/BooleanBug.groovy | 8 +-
src/test/groovy/bugs/Bytecode2Bug.groovy | 21 ++-
src/test/groovy/bugs/Bytecode3Bug.groovy | 6 +-
src/test/groovy/bugs/Bytecode4Bug.groovy | 8 +-
src/test/groovy/bugs/Bytecode5Bug.groovy | 2 +-
src/test/groovy/bugs/Bytecode6Bug.groovy | 6 +-
src/test/groovy/bugs/BytecodeBug.groovy | 6 +-
.../bugs/CallingClosuresWithClosuresBug.groovy | 4 +-
.../groovy/bugs/ClassGeneratorFixesTest.groovy | 2 +-
src/test/groovy/bugs/ClassInNamedParamsBug.groovy | 10 +-
.../groovy/bugs/ClosureParameterPassingBug.groovy | 10 +-
.../groovy/bugs/ClosureTypedVariableBug.groovy | 15 +-
src/test/groovy/bugs/ClosureVariableBug.groovy | 16 +-
.../bugs/ClosureWithStaticVariablesBug.groovy | 4 +-
src/test/groovy/bugs/ConstructorBug.groovy | 6 +-
src/test/groovy/bugs/DefVariableBug.groovy | 6 +-
.../bugs/DirectMethodCallWithVargsTest.groovy | 18 +--
src/test/groovy/bugs/ForLoopBug.groovy | 1 -
src/test/groovy/bugs/FullyQualifiedClassBug.groovy | 2 +-
src/test/groovy/bugs/GetterBug.groovy | 32 ++--
src/test/groovy/bugs/Groovy1018_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy1081_Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy1462_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy239_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy252_Bug.groovy | 16 +-
src/test/groovy/bugs/Groovy2773Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy278_Bug.groovy | 20 ++-
src/test/groovy/bugs/Groovy308_Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3135Bug.groovy | 14 +-
src/test/groovy/bugs/Groovy3139Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3156And2621Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3163Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3208Bug.groovy | 18 +--
src/test/groovy/bugs/Groovy3235Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3238Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3305Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3383Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3389Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3410Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3422.groovy | 2 +-
src/test/groovy/bugs/Groovy3446Bug.groovy | 1 -
src/test/groovy/bugs/Groovy3465Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3511Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3519Bug.groovy | 4 -
src/test/groovy/bugs/Groovy3574Bug.groovy | 14 +-
src/test/groovy/bugs/Groovy3679Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3718Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy3720Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3723Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3749Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy3768Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3770Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy3776Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3827Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3831Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3834Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy3868Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy389_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4035Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4038Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4043Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4046Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4069Bug.groovy | 44 +++---
src/test/groovy/bugs/Groovy4075Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4080Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4081Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4107Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4111Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4116Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4121Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4133Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4169Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4188Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4190Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4191Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4202Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4241Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4243Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4246Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4264Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4273Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4293Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4410Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy4414Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy4415Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4416Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy4449Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy4497Bug.groovy | 12 +-
src/test/groovy/bugs/Groovy4958Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy4999Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5030Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy513_Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5212Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5260Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy5267Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy5272Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy6271Bug.groovy | 16 +-
src/test/groovy/bugs/Groovy6804Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy7031Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy7204Bug.groovy | 172 ++++++++++-----------
src/test/groovy/bugs/Groovy770_Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy7867.groovy | 10 +-
src/test/groovy/bugs/Groovy7995Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8055Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8059Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8084Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8085Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8090Bug.groovy | 10 +-
src/test/groovy/bugs/Groovy8138Bug.groovy | 4 +-
src/test/groovy/bugs/Groovy8140Bug.groovy | 1 -
src/test/groovy/bugs/Groovy8212Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy831_Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy8389Bug.groovy | 32 ++--
src/test/groovy/bugs/Groovy8405Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy8444.groovy | 8 +-
src/test/groovy/bugs/Groovy8474Bug.groovy | 92 +++++------
src/test/groovy/bugs/Groovy8595Bug.groovy | 8 +-
src/test/groovy/bugs/Groovy8629Bug.groovy | 22 +--
src/test/groovy/bugs/Groovy8819Bug.groovy | 6 +-
src/test/groovy/bugs/Groovy8947.groovy | 2 +-
src/test/groovy/bugs/Groovy9329.groovy | 4 +-
src/test/groovy/bugs/Groovy9589.groovy | 1 -
src/test/groovy/bugs/Groovy9601.groovy | 10 +-
src/test/groovy/bugs/GroovyInnerEnumBug.groovy | 2 +-
src/test/groovy/bugs/GuillaumesBug.groovy | 2 +-
src/test/groovy/bugs/GuillaumesMapBug.groovy | 30 ++--
...vokeNormalMethodFromBuilder_Groovy657Bug.groovy | 2 +-
.../groovy/bugs/IterateOverCustomTypeBug.groovy | 6 +-
src/test/groovy/bugs/MarkupAndMethodBug.groovy | 12 +-
...MethodCallWithoutParensInStaticMethodBug.groovy | 2 +-
src/test/groovy/bugs/MethodClosureTest.groovy | 4 +-
src/test/groovy/bugs/MethodDispatchBug.groovy | 4 +-
src/test/groovy/bugs/NestedClosure2Bug.groovy | 12 +-
src/test/groovy/bugs/NestedClosureBug.groovy | 4 +-
src/test/groovy/bugs/NullCompareBug.groovy | 2 +-
.../groovy/bugs/OverloadInvokeMethodBug.groovy | 6 +-
src/test/groovy/bugs/PrimitivePropertyBug.groovy | 4 +-
src/test/groovy/bugs/PrintlnWithNewBug.groovy | 2 +-
src/test/groovy/bugs/RodsBooleanBug.groovy | 6 +-
.../groovy/bugs/StaticClosurePropertyBug.groovy | 4 +-
src/test/groovy/bugs/StaticMethodCallBug.groovy | 2 +-
.../groovy/bugs/SubscriptAndExpressionBug.groovy | 36 ++---
.../bugs/SubscriptOnPrimitiveTypeArrayBug.groovy | 10 +-
.../groovy/bugs/SubscriptOnStringArrayBug.groovy | 10 +-
src/test/groovy/bugs/SuperMethod2Bug.groovy | 46 +++---
.../groovy/bugs/SynchronizedBytecodeBug.groovy | 168 ++++++++++----------
src/test/groovy/bugs/TestBase.groovy | 6 +-
src/test/groovy/bugs/TestDerived.groovy | 3 +-
src/test/groovy/bugs/TryCatch2Bug.groovy | 6 +-
src/test/groovy/bugs/TryCatchBug.groovy | 2 +-
src/test/groovy/bugs/VariablePrecedence.groovy | 4 +-
src/test/groovy/bugs/VariableScopingBug.groovy | 2 +-
src/test/groovy/bugs/ZoharsBug.groovy | 4 +-
.../bugs/groovy5912/otherpkg/Groovy5912Bug.groovy | 6 +-
src/test/groovy/bugs/groovy8966/Groovy8966.groovy | 2 +-
src/test/groovy/bugs/groovy9204/Groovy9204.groovy | 2 +-
.../groovy/bugs/groovy9236/Groovy9236Bug.groovy | 4 +-
.../groovy/generated/DelegateGeneratedTest.groovy | 6 +-
src/test/groovy/lang/CategoryAnnotationTest.groovy | 30 ++--
src/test/groovy/lang/ExceptionTest.groovy | 12 +-
.../lang/ExpandoMetaClassConstructorTest.groovy | 2 +-
src/test/groovy/lang/ExpandoMetaClassTest.groovy | 2 +-
src/test/groovy/lang/GroovyClassLoaderTest.groovy | 6 +-
src/test/groovy/lang/GroovyShellTest.java | 6 +-
src/test/groovy/lang/MixinTest.groovy | 4 +-
src/test/groovy/lang/SpreadMapTest.java | 4 +-
src/test/groovy/lang/StripMarginTest.groovy | 2 +-
.../groovy/mock/example/SandwichMakerTest.groovy | 2 +-
.../mock/interceptor/MockSingleCallTest.groovy | 2 +-
.../groovy/operator/BigDecimalOperatorsTest.groovy | 16 +-
.../operator/BigIntegerOperationsTest.groovy | 6 +-
.../groovy/operator/IntegerOperatorsTest.groovy | 44 +++---
src/test/groovy/operator/NegateListsTest.groovy | 2 +-
.../groovy/operator/StringOperatorsTest.groovy | 2 +-
.../groovy/operator/TernaryOperatorsTest.groovy | 10 +-
.../groovy/operator/UnaryMinusOperatorTest.groovy | 16 +-
src/test/groovy/transform/ReadWriteLockTest.groovy | 2 +-
src/test/groovy/transform/stc/WithSTCTest.groovy | 2 +-
src/test/groovy/tree/ClosureClassLoaderBug.groovy | 4 +-
src/test/groovy/tree/NestedClosureBugTest.groovy | 2 +-
src/test/groovy/tree/SmallTreeTest.groovy | 6 +-
src/test/groovy/tree/TreeTest.groovy | 28 ++--
src/test/groovy/tree/VerboseTreeTest.groovy | 28 ++--
src/test/groovy/util/BuilderSupportTest.groovy | 4 +-
src/test/groovy/util/ConfigObjectTest.groovy | 18 +--
src/test/groovy/util/ConfigSlurperTest.groovy | 2 +-
.../groovy/util/FactoryBuilderSupportTest.groovy | 2 +-
src/test/groovy/util/ObjectGraphBuilderTest.groovy | 2 +-
.../groovy/util/ProxyGeneratorAdapterTest.groovy | 10 +-
src/test/groovy/util/ProxyGeneratorTest.groovy | 6 +-
src/test/groovy/util/ProxyTest.groovy | 12 +-
.../groovy/lang/GroovyObjectHelperTest.groovy | 2 +-
.../org/apache/groovy/util/JavaShellTest.groovy | 4 +-
src/test/org/codehaus/groovy/ast/ASTNodeTest.java | 2 +-
.../org/codehaus/groovy/ast/MethodNodeTest.groovy | 8 +-
.../groovy/ast/source/Groovy3049Test.groovy | 34 ++--
.../groovy/ast/source/Groovy3050Test.groovy | 25 ++-
.../groovy/ast/source/Groovy3051Test.groovy | 72 +++++----
.../classgen/CallClosureFieldAsMethodTest.groovy | 2 +-
.../codehaus/groovy/classgen/CallSiteTest.groovy | 2 +-
.../groovy/classgen/ConstructorIssueTest.groovy | 8 +-
src/test/org/codehaus/groovy/classgen/Main.groovy | 2 +-
.../codehaus/groovy/classgen/MetaClassTest.groovy | 2 +-
.../codehaus/groovy/classgen/VerifierTest.groovy | 8 +-
.../classgen/asm/BinaryOperationsTest.groovy | 8 +-
.../classgen/asm/DirectMethodCallTest.groovy | 6 +-
.../groovy/classgen/asm/HotSwapTest.groovy | 4 +-
.../asm/InstructionSequenceHelperClassTest.groovy | 4 +-
.../groovy/classgen/asm/MethodPatternsTest.groovy | 4 +-
.../asm/sc/StaticCompileConstructorsTest.groovy | 2 +-
.../classgen/asm/sc/StaticCompileMathTest.groovy | 2 +-
.../TupleConstructorStaticCompilationTest.groovy | 2 +-
.../classgen/asm/sc/bugs/Groovy6657Bug.groovy | 1 -
.../classgen/asm/sc/bugs/Groovy6693Bug.groovy | 26 ++--
.../classgen/asm/sc/bugs/Groovy7042Bug.groovy | 5 -
.../classgen/asm/sc/bugs/Groovy7883Bug.groovy | 30 ++--
.../classgen/asm/sc/bugs/Groovy8240Bug.groovy | 12 +-
.../asm/sc/bugs/ReproducibleBytecodeBugs.groovy | 6 +-
.../ASTTransformationCustomizerTest.groovy | 2 +-
.../groovy/control/io/FileReaderTest.groovy | 4 +-
.../runtime/InvokerHelperFormattingTest.groovy | 4 +-
.../codehaus/groovy/runtime/NullObjectTest.groovy | 12 +-
.../groovy/runtime/PerInstanceMetaClassTest.groovy | 4 +-
.../groovy/runtime/memoize/CacheCleanupTest.groovy | 2 +-
.../groovy/runtime/memoize/MemoizeTest.groovy | 18 +--
.../runtime/trampoline/TrampolineTest.groovy | 2 +-
src/test/org/codehaus/groovy/syntax/TokenTest.java | 2 +-
...otationMemberValuesResolutionV1StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV2StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV3StubsTest.groovy | 8 +-
...otationMemberValuesResolutionV4StubsTest.groovy | 2 +-
.../DuplicateMethodAdditionInStubsTest.groovy | 6 +-
.../stubgenerator/RedundantCastInStubTest.groovy | 2 +-
.../stubgenerator/StringSourcesStubTestCase.groovy | 4 +-
.../StubGenerationForAnAnnotationStubsTest.groovy | 2 +-
...nForConstructorWithOptionalArgsStubsTest.groovy | 2 +-
.../UnAmbigousSuperConstructorCallStubsTest.groovy | 6 +-
.../AutoFinalTransformBlackBoxTest.groovy | 6 +-
.../transform/BaseScriptTransformTest.groovy | 10 +-
.../groovy/transform/CanonicalTransformTest.groovy | 26 ++--
.../transform/MemoizedASTTransformationTest.groovy | 2 +-
.../groovy/transform/NewifyTransformTest.groovy | 2 +-
.../groovy/transform/ToStringTransformTest.groovy | 6 +-
.../groovy/transform/stc/SignatureCodecTest.groovy | 8 +-
.../groovy/util/ManagedLinkedlistTest.groovy | 12 +-
.../v8/PluginDefaultGroovyMethodsTest.groovy | 6 +-
.../org/codehaus/groovy/classgen/TestSupport.java | 2 +-
.../src/main/java/groovy/ant/AntBuilder.java | 4 +-
.../codehaus/groovy/ant/CompileTaskSupport.java | 6 +-
.../java/org/codehaus/groovy/ant/FileScanner.java | 6 +-
.../java/org/codehaus/groovy/ant/GroovycTask.java | 2 +-
.../org/codehaus/groovy/ant/RootLoaderRef.java | 2 +-
.../org/codehaus/groovy/ant/UberCompileTask.java | 12 +-
.../groovy-ant/src/spec/doc/groovy-ant-task.adoc | 6 +-
.../groovy-ant/src/spec/doc/groovyc-ant-task.adoc | 1 -
.../src/test-resources/groovy/ant/AntTest.xml | 2 +-
.../test-resources/groovy/ant/AntTest_import.xml | 2 +-
.../test/groovy/groovy/ant/Groovy8496Test.groovy | 2 +-
.../groovy/org/codehaus/groovy/ant/GroovyTest.java | 6 +-
.../ast/builder/AstBuilderTransformation.java | 4 +-
.../test/groovy/groovy/bugs/MyConstants4272.java | 2 +-
.../bugs/MyConstantsASTTransformation4272.groovy | 14 +-
.../ast/builder/AstBuilderFromCodeTest.groovy | 4 +-
.../builder/AstBuilderFromSpecificationTest.groovy | 12 +-
.../ast/builder/AstBuilderFromStringTest.groovy | 6 +-
.../groovy/cli/picocli/CliBuilderTest.groovy | 2 +-
.../src/main/groovy/groovy/console/TextNode.groovy | 12 +-
.../groovy/groovy/console/TextTreeNodeMaker.groovy | 2 +-
.../groovy/groovy/console/ui/AstBrowser.groovy | 8 +-
.../groovy/console/ui/ConsoleTextEditor.java | 2 +-
.../ui/text/StructuredSyntaxDocumentFilter.java | 156 +++++++++----------
.../console/ui/text/StructuredSyntaxResources.java | 8 +-
.../groovy/console/ui/view/GTKDefaults.groovy | 2 +-
.../ui/HistoryRecordGetTextToRunTests.groovy | 8 +-
.../tests/doc/DocumentationExampleTests.groovy | 6 +-
.../tests/doc/RootClassExampleTests.groovy | 18 +--
.../contracts/tests/inv/InheritanceTests.groovy | 6 +-
.../contracts/tests/post/InheritanceTests.groovy | 2 +-
.../collection/runtime/QueryableCollection.java | 4 +-
.../test/org/apache/groovy/ginq/GinqTest.groovy | 168 ++++++++++----------
.../org/apache/groovy/ginq/GinqErrorTest.groovy | 10 +-
.../tools/groovydoc/ClasspathResourceManager.java | 2 +-
.../groovy/tools/groovydoc/MockOutputTool.java | 6 +-
.../groovydoc/SimpleGroovyExecutableMemberDoc.java | 4 +-
.../gstringTemplates/classLevel/classDocName.html | 18 +--
.../testfiles/ClassWithAnonymousInnerClass.java | 2 +-
.../apache/groovy/groovysh/BufferManager.groovy | 26 ++--
.../org/apache/groovy/groovysh/Groovysh.groovy | 2 +-
.../groovy/groovysh/commands/ShadowCommand.groovy | 6 +-
.../antlr4/VariableSyntaxCompleter.groovy | 1 -
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 2 +-
.../groovysh/commands/HelpCommandTest.groovy | 4 +-
.../groovy-jmx/src/spec/test/JmxTest.groovy | 18 +--
.../java/groovy/jmx/builder/MockManagedObject.java | 8 +-
.../test/groovy/groovy/json/JsonBuilderTest.groovy | 2 +-
.../groovy/json/StreamingJsonBuilderTest.groovy | 8 +-
.../groovy/jsr223/GroovyScriptEngineImpl.java | 8 +-
.../org/codehaus/groovy/jsr223/JSR223Test.groovy | 2 +-
.../groovy/macro/MacroTransformationTest.groovy | 2 +-
.../groovy/macro/matcher/ASTMatcherTest.groovy | 2 +-
.../java/groovy/servlet/AbstractHttpServlet.java | 8 +-
.../main/java/groovy/servlet/ServletBinding.java | 28 ++--
.../main/java/groovy/servlet/TemplateServlet.java | 4 +-
.../src/spec/test/servlet/GroovyServletTest.groovy | 2 +-
.../src/main/java/groovy/sql/GroovyRowResult.java | 2 +-
.../test/groovy/groovy/sql/SqlCompleteTest.groovy | 2 +-
.../main/groovy/groovy/swing/SwingBuilder.groovy | 2 +-
.../groovy/swing/factory/ActionFactory.groovy | 2 +-
.../groovy/groovy/swing/factory/BoxFactory.groovy | 2 +-
.../groovy/swing/factory/CollectionFactory.groovy | 2 +-
.../groovy/swing/factory/ComboBoxFactory.groovy | 2 +-
.../swing/factory/FormattedTextFactory.groovy | 2 +-
.../groovy/swing/factory/LineBorderFactory.groovy | 2 +-
.../groovy/groovy/swing/factory/MapFactory.groovy | 2 +-
.../groovy/swing/factory/MatteBorderFactory.groovy | 2 +-
.../groovy/swing/factory/SeparatorFactory.groovy | 2 +-
.../groovy/swing/factory/SplitPaneFactory.groovy | 2 +-
.../groovy/swing/factory/TableLayoutFactory.groovy | 4 +-
.../groovy/swing/factory/TableModelFactory.groovy | 2 +-
.../swing/factory/TitledBorderFactory.groovy | 2 +-
.../groovy/swing/factory/WindowFactory.groovy | 2 +-
.../groovy/groovy/swing/impl/DefaultAction.java | 2 +-
.../main/groovy/groovy/swing/impl/TableLayout.java | 4 +-
.../groovy/groovy/swing/impl/TableLayoutCell.java | 24 +--
.../groovy/groovy/swing/impl/TableLayoutRow.java | 8 +-
.../groovy/swing/model/DefaultTableColumn.java | 4 +-
.../java/groovy/swing/model/DefaultTableModel.java | 22 +--
.../main/java/groovy/swing/model/FormModel.java | 4 +-
.../java/groovy/swing/model/PropertyModel.java | 2 +-
.../main/java/groovy/swing/model/ValueHolder.java | 12 +-
.../groovy/swing/binding/BindingUpdatable.java | 4 +-
.../src/spec/test/SwingBuilderTest.groovy | 4 +-
.../groovy/groovy/swing/StrangeEventListener.java | 4 +-
.../TitledBorderFactoryJustificationTest.groovy | 4 +-
.../groovy/swing/beans/BindableSwingTest.groovy | 4 +-
.../groovy/swing/model/TableModelTest.groovy | 16 +-
.../src/spec/test/TemplateEnginesTest.groovy | 14 +-
.../groovy/test/JavadocAssertionTestBuilder.groovy | 26 ++--
.../groovy/test/JavadocAssertionTestSuite.groovy | 16 +-
.../test/JavadocAssertionTestBuilderTest.groovy | 24 +--
.../src/main/groovy/groovy/xml/Entity.groovy | 24 +--
.../groovy/xml/StreamingMarkupBuilder.groovy | 6 +-
.../src/main/java/groovy/xml/DOMBuilder.java | 4 +-
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../src/main/java/groovy/xml/NamespaceBuilder.java | 2 +-
.../java/groovy/xml/NamespaceBuilderSupport.java | 2 +-
.../src/main/java/groovy/xml/XmlSlurper.java | 4 +-
.../groovy/xml/slurpersupport/GPathResult.java | 2 +-
.../java/groovy/xml/slurpersupport/NodeChild.java | 2 +-
.../groovy/xml/slurpersupport/NodeParents.java | 8 +-
.../groovy/xml/slurpersupport/ReplacementNode.java | 2 +-
.../groovy/xml/streamingmarkupsupport/Builder.java | 16 +-
.../groovy-xml/src/spec/test/DOMBuilderTest.groovy | 4 +-
.../groovy-xml/src/spec/test/SaxBuilderTest.groovy | 10 +-
.../src/spec/test/StaxBuilderTest.groovy | 10 +-
.../src/test/groovy/groovy/xml/DOMTest.groovy | 26 ++--
.../groovy/groovy/xml/NamespaceNodeTest.groovy | 4 +-
.../src/test/groovy/groovy/xml/SAXTest.groovy | 10 +-
.../test/groovy/groovy/xml/VerboseDOMTest.groovy | 24 +--
.../groovy/groovy/xml/bugs/Groovy249_Bug.groovy | 18 +--
.../groovy/groovy/xml/bugs/Groovy4285Bug.groovy | 2 +-
.../groovy/groovy/xml/bugs/StaticMarkupBug.groovy | 2 +-
.../groovy/groovy/xml/script/AtomTestScript.groovy | 2 +-
.../resources/org/apache/groovy/xml/tools/po.xsd | 2 +-
.../org/apache/groovy/xml/tools/swing.xml | 1 -
.../org/apache/groovy/xml/tools/swing2.xml | 1 -
658 files changed, 3172 insertions(+), 3239 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0867926..b7523ba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ limitations under the License.
# Contributing
-Please visit the
+Please visit the
[project development web site](https://groovy.apache.org/)
to find out more about contributing to the project.
We welcome all contributors.
\ No newline at end of file
diff --git a/DOAP.rdf b/DOAP.rdf
index e202fa7..e23ee91 100644
--- a/DOAP.rdf
+++ b/DOAP.rdf
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
@@ -12,9 +12,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/README.adoc b/README.adoc
index 1c9f5b7..18af2ca 100644
--- a/README.adoc
+++ b/README.adoc
@@ -61,7 +61,7 @@ static compilation and static type checking at levels similar to or greater than
It aims to greatly increase developer productivity with many powerful features but also a concise, familiar and easy to learn syntax.
It integrates smoothly with any Java class or library, and immediately delivers to your application powerful capabilities,
-including scripting support, Domain-Specific Language authoring, runtime and compile-time meta-programming and functional programming.
+including scripting support, Domain-Specific Language authoring, runtime and compile-time meta-programming and functional programming.
== Downloading
diff --git a/benchmark/bench.groovy b/benchmark/bench.groovy
index 910d0a0..1e76f06 100644
--- a/benchmark/bench.groovy
+++ b/benchmark/bench.groovy
@@ -77,7 +77,7 @@ def executeBench= { bench, input ->
println "Benchmark $bench"
[".java", ".groovy"].each { ending ->
println("\t$bench$ending :")
-
+
boolean exists = prepare(bench, ending)
if (exists) {
execBenchmark(bench, input)
@@ -88,7 +88,7 @@ def executeBench= { bench, input ->
}
horizontalBreak()
}
-if (args.length==0) {
+if (args.length==0) {
benchData.each(executeBench)
} else {
executeBench(args[0],benchData[args[0]])
@@ -133,7 +133,7 @@ void showJavaVersion() {
}
void execBenchmark(bench, input) {
- input.each { param ->
+ input.each { param ->
def cp = "./exec/" + File.pathSeparatorChar
cp += GROOVY_LIB + File.pathSeparatorChar
cp += "../build/lib/runtime/*"
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle b/buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
index ef14644..d44211e 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-bad-practices-detection.gradle
@@ -58,7 +58,7 @@ class ContainerMetaclassClass extends DelegatingMetaClass {
Object invokeMethod(Object object, String name, Object arg) {
maybeConfigure(super.invokeMethod(object, name, arg), name)
}
-
+
private Object maybeConfigure(Object object, String name) {
if ('detachedConfiguration' == name) {
configuration(object)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle b/buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle
index 4268019..4fa62e0 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-stresstest.gradle
@@ -32,7 +32,6 @@ sourceSets {
}
}
-
def stressTest = tasks.register("stressTest", Test) {
description = "Runs the stress tests."
group = "verification"
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
index 9251e88..0e021df 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/WriteExtensionDescriptorTask.groovy
@@ -34,7 +34,6 @@ class WriteExtensionDescriptorTask extends DefaultTask {
@Input String staticExtensionClasses = ''
@OutputFile File descriptor = computeDescriptorFile()
-
private File computeDescriptorFile() {
def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/groovy")
return new File(metaInfDir, "org.codehaus.groovy.runtime.ExtensionModule")
@@ -52,4 +51,3 @@ staticExtensionClasses=${staticExtensionClasses}"""
}
}
-
diff --git a/config/codenarc/codenarc.groovy b/config/codenarc/codenarc.groovy
index 03c8d9b..2a532ca 100644
--- a/config/codenarc/codenarc.groovy
+++ b/config/codenarc/codenarc.groovy
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-ruleset {
+ruleset {
ruleset('rulesets/naming.xml') {
exclude 'PackageName' {
regex = '^[a-z]([a-zA-Z\\.0-9])*\\b'
- }
+ }
'ClassName' {
regex = '^[A-Z]([a-zA-Z0-9$_])*\\b'
@@ -31,14 +31,14 @@ ruleset {
finalRegex = '^[a-z]([a-zA-Z0-9$])*\\b'
staticFinalRegex = '^[A-Z]([A-Z0-9$_])*\\b|^serialVersionUID\\b'
staticRegex = '^[A-Z]([A-Z0-9$_])*\\b'
- doNotApplyToClassNames='Entity,AstNodeToScriptVisitor,LookAndFeelHelper,SwingBuilder,Console,' +
- 'JavadocAssertionTestBuilder,JavadocAssertionTestSuite,Main,Groovysh,Parser,' +
- 'AliasTargetProxyCommand,WorkerThread,Cheddar,CategoryTestPropertyCategory,' +
- 'GroovyClosureMethodsTest,SingletonBugPrivate,SingletonBugProtected,' +
- 'GroovyInnerEnumBug$MyEnum,GroovyInnerEnumBug,' +
- 'CategoryTestHelperPropertyReplacer,PrimitiveTypeFieldTest,I3830,Cheese,' +
- 'SingletonBugTest,ClosureWithStaticVariablesBug,Groovy1018_Bug,Groovy3830Bug,Groovy4386_Bug,' +
- 'GroovyInnerEnumBug,GroovySwingTestCase,GpathSyntaxTestSupport,MixedMarkupTestSupport,' +
+ doNotApplyToClassNames='Entity,AstNodeToScriptVisitor,LookAndFeelHelper,SwingBuilder,Console,' +
+ 'JavadocAssertionTestBuilder,JavadocAssertionTestSuite,Main,Groovysh,Parser,' +
+ 'AliasTargetProxyCommand,WorkerThread,Cheddar,CategoryTestPropertyCategory,' +
+ 'GroovyClosureMethodsTest,SingletonBugPrivate,SingletonBugProtected,' +
+ 'GroovyInnerEnumBug$MyEnum,GroovyInnerEnumBug,' +
+ 'CategoryTestHelperPropertyReplacer,PrimitiveTypeFieldTest,I3830,Cheese,' +
+ 'SingletonBugTest,ClosureWithStaticVariablesBug,Groovy1018_Bug,Groovy3830Bug,Groovy4386_Bug,' +
+ 'GroovyInnerEnumBug,GroovySwingTestCase,GpathSyntaxTestSupport,MixedMarkupTestSupport,' +
'TraversalTestSupport,CallClosureFieldAsMethodTest'
}
'PropertyName' {
@@ -50,7 +50,7 @@ ruleset {
'groovy.swing.factory.TitledBorderFactory,groovy.ui.Console,groovy.ui.OutputTransforms,' +
'org.codehaus.groovy.tools.shell.commands.HistoryCommand,org.codehaus.groovy.tools.shell.commands.PurgeCommand,' +
'org.codehaus.groovy.tools.shell.commands.RecordCommand,org.codehaus.groovy.tools.shell.commands.ShadowCommand,' +
- 'org.codehaus.groovy.tools.shell.commands.ShowCommand,org.codehaus.groovy.tools.shell.ComplexCommandSupport,' +
+ 'org.codehaus.groovy.tools.shell.commands.ShowCommand,org.codehaus.groovy.tools.shell.ComplexCommandSupport,' +
'groovy.bugs.StaticPropertyFoo,groovy.bugs.Groovy3135Bug,groovy.util.XmlParserTest,' +
'org.codehaus.groovy.runtime.PerInstanceMetaClassTest,groovy.StaticImportChild,' +
'gls.scope.VariablePrecedenceTest,groovy.bugs.Groovy3069Bug,groovy.StaticImportTarget,' +
@@ -75,24 +75,24 @@ ruleset {
'VariableName' {
regex = '^[a-z]([a-zA-Z0-9$])*\\b'
finalRegex = '^[a-z]([a-zA-Z0-9$])*\\b'
- doNotApplyToClassNames='groovy.GroovyClosureMethodsTest,groovy.RegularExpressionsTest,groovy.NumberMathTest,' +
- 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'groovy.NumberMathTest,groovy.RegularExpressionsTest,' +
- 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'groovy.RegularExpressionsTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'groovy.NumberMathTest,groovy.ValidNameTest,groovy.ValidNameTest,' +
- 'org.codehaus.groovy.runtime.PerInstanceMetaClassTest,' +
- 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
- 'gls.scope.NameResolvingTest,groovy.util.AntTest,groovy.sql.SqlCacheTest,' +
- 'groovy.operator.NegateListsTest,org.codehaus.groovy.reflection.WeakMapTest,' +
+ doNotApplyToClassNames='groovy.GroovyClosureMethodsTest,groovy.RegularExpressionsTest,groovy.NumberMathTest,' +
+ 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'groovy.NumberMathTest,groovy.RegularExpressionsTest,' +
+ 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'groovy.RegularExpressionsTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'groovy.NumberMathTest,groovy.ValidNameTest,groovy.ValidNameTest,' +
+ 'org.codehaus.groovy.runtime.PerInstanceMetaClassTest,' +
+ 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,groovy.NumberMathTest,' +
+ 'gls.scope.NameResolvingTest,groovy.util.AntTest,groovy.sql.SqlCacheTest,' +
+ 'groovy.operator.NegateListsTest,org.codehaus.groovy.reflection.WeakMapTest,' +
'groovy.RegularExpressionsTest,gls.scope.NameResolvingTest'
}
'MethodName' {
- doNotApplyToClassNames='groovy.swing.SwingBuilder,groovy.$Temp,groovy.bugs.Groovy4119Bug,' +
- 'groovy.lang.MetaClassRegistryTest,groovy.lang.MixinTest,' +
+ doNotApplyToClassNames='groovy.swing.SwingBuilder,groovy.$Temp,groovy.bugs.Groovy4119Bug,' +
+ 'groovy.lang.MetaClassRegistryTest,groovy.lang.MixinTest,' +
'groovy.swing.TitledBorderFactoryJustificationTest'
doNotApplyToFilesMatching='.*spectralnorm\\.groovy'
}
@@ -135,14 +135,14 @@ ruleset {
'UnusedPrivateField' {
doNotApplyToClassNames='gls.annotations.closures.CallOnOwner,gls.annotations.closures.CallOnThisObject,' +
- 'gls.annotations.closures.UnqualifiedCall,gls.annotations.closures.ClosureWithParameters,' +
+ 'gls.annotations.closures.UnqualifiedCall,gls.annotations.closures.ClosureWithParameters,' +
'gls.annotations.closures.JavaCompatibility,gls.annotations.closures.JavaCompatibilityParameterized,' +
'groovy.Foo,groovy.Singlet'
}
'UnusedPrivateMethod' {
- doNotApplyToClassNames='org.codehaus.groovy.ast.builder.AstBuilder,org.codehaus.groovy.ast.builder.AstSpecificationCompiler,' +
- 'StringMethodName,Foo'
+ doNotApplyToClassNames='org.codehaus.groovy.ast.builder.AstBuilder,org.codehaus.groovy.ast.builder.AstSpecificationCompiler,' +
+ 'StringMethodName,Foo'
}
'UnusedPrivateMethodParameter' {
@@ -150,7 +150,7 @@ ruleset {
}
'UnusedObject' {
- doNotApplyToClassNames='groovy.ui.OutputTransforms,org.codehaus.groovy.ast.builder.AstSpecificationCompiler,groovy.lang.GroovyCodeSourceTest'
+ doNotApplyToClassNames='groovy.ui.OutputTransforms,org.codehaus.groovy.ast.builder.AstSpecificationCompiler,groovy.lang.GroovyCodeSourceTest'
}
}
@@ -208,11 +208,11 @@ ruleset {
ruleset('rulesets/unnecessary.xml') {
'UnnecessaryInstantiationToGetClass' {
doNotApplyToClassNames='SpreadDotTest'
- }
+ }
'ConsecutiveStringConcatenation' {
- doNotApplyToClassNames='groovy.DynamicMemberTest,groovy.StaticImportTest,groovy.bugs.Groovy675_Bug,groovy.bugs.MorgansBug,' +
- 'groovy.bugs.WriteOnlyPropertyBug,groovy.operator.StringOperatorsTest,groovy.swing.SwingBuilderTest,' +
+ doNotApplyToClassNames='groovy.DynamicMemberTest,groovy.StaticImportTest,groovy.bugs.Groovy675_Bug,groovy.bugs.MorgansBug,' +
+ 'groovy.bugs.WriteOnlyPropertyBug,groovy.operator.StringOperatorsTest,groovy.swing.SwingBuilderTest,' +
'org.codehaus.groovy.runtime.powerassert.EvaluationTest,groovy.json.JsonLexerTest'
}
@@ -227,7 +227,7 @@ ruleset {
exclude 'DuplicateStringLiteral' // too many to worry about, review later
}
ruleset('rulesets/design.xml') {
- 'CloseWithoutCloseable' {
+ 'CloseWithoutCloseable' {
doNotApplyToClassNames='Log4jInterceptingAppender'
}
exclude 'EmptyMethodInAbstractClass' // too many to worry about, review later
diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle
index 9d0b4ef..427ddf5 100644
--- a/gradle/build-scans.gradle
+++ b/gradle/build-scans.gradle
@@ -31,14 +31,14 @@ gradleEnterprise {
} else if (!hasRefused) {
gradle.buildFinished {
println """
-This build uses Gradle Build Scans to gather statistics, share information about
+This build uses Gradle Build Scans to gather statistics, share information about
failures, environmental issues, dependencies resolved during the build and more.
-Build scans will be published after each build, if you accept the terms of
+Build scans will be published after each build, if you accept the terms of
service, and in particular the privacy policy.
-Please read
-
- https://gradle.com/terms-of-service
+Please read
+
+ https://gradle.com/terms-of-service
https://gradle.com/legal/privacy
and then:
@@ -46,7 +46,7 @@ and then:
- set the `GRADLE_SCANS_ACCEPT` to `yes`/`no` if you agree with/refuse the TOS
- or create the ${acceptFile} file with `yes`/`no` in it if you agree with/refuse
-And we'll not bother you again. Note that build scans are only made public if
+And we'll not bother you again. Note that build scans are only made public if
you share the URL at the end of the build.
"""
}
diff --git a/security/groovy.policy b/security/groovy.policy
index d37d973..fe9d0fa 100644
--- a/security/groovy.policy
+++ b/security/groovy.policy
@@ -21,7 +21,7 @@
*
* The following methods in groovy have privileged operations wrapping
* setAccessible. If these wrappers are not provided, most codebases below
- * must have the following grant:
+ * must have the following grant:
* permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
* MetaMethod.createMetaMethod
* MetaMethod.invoke(Object Object[])
@@ -105,7 +105,7 @@ grant codeBase "file:${user.dir}/../../plugins/-" {
* The following codebases are assigned when groovy parses a groovy script
*/
-/*
+/*
* GroovyShell.parse(InputStream,...) is given a codebase of "groovy.shell" because no actual
* codebase can be determined. The other forms of parse(File) and parse(GroovyCodeSource) allow
* for more control. These permission should be set to control scripts that are passed into
@@ -142,7 +142,7 @@ grant codeBase "file:/groovy/testSupport" {
* than read from a file). Note that even though the codebases conform to
* the file URL syntax, they are not physical files: they represent virtual
* codebases.
- * The permission grant that is commented out is the permission that is
+ * The permission grant that is commented out is the permission that is
* expected to be missing by the test case. It is here as a comment for
* information.
*/
@@ -169,7 +169,7 @@ grant codeBase "file:/groovy/security/javax/print/allow" {
/*
* ================= .groovy script file codebases ===============
* The following grants are for individual security test cases.
- * The permission grant that is commented out is the permission that is
+ * The permission grant that is commented out is the permission that is
* expected to be missing by the test case. It is here as a comment for
* information.
*/
diff --git a/src/bin/java2groovy.bat b/src/bin/java2groovy.bat
index c137b39..4580ca3 100644
--- a/src/bin/java2groovy.bat
+++ b/src/bin/java2groovy.bat
@@ -19,9 +19,9 @@
@if "%DEBUG%" == "" @echo off
-@rem
+@rem
@rem $Revision: 2770 $ $Date: 2005-08-29 11:49:42 +0100 (Mon, 29 Aug 2005) $
-@rem
+@rem
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
diff --git a/src/bin/startGroovy b/src/bin/startGroovy
index 5a50832..ee83bd4 100644
--- a/src/bin/startGroovy
+++ b/src/bin/startGroovy
@@ -65,7 +65,7 @@ linux=false
case "$(uname)" in
CYGWIN* )
cygwin=true
- ;;
+ ;;
Darwin* )
darwin=true
;;
@@ -95,7 +95,7 @@ fi
# Attempt to set JAVA_HOME if it's not already set.
if [ -z "$JAVA_HOME" ] ; then
- if $darwin ; then
+ if $darwin ; then
[ -z "$JAVA_HOME" ] && [ -f "/usr/libexec/java_home" ] && JAVA_HOME="$(/usr/libexec/java_home)"
[ -z "$JAVA_HOME" ] && [ -d "/Library/Java/Home" ] && JAVA_HOME="/Library/Java/Home"
[ -z "$JAVA_HOME" ] && [ -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
diff --git a/src/main/groovy/groovy/beans/ListenerList.groovy b/src/main/groovy/groovy/beans/ListenerList.groovy
index c8e88cc..7092bc7 100644
--- a/src/main/groovy/groovy/beans/ListenerList.groovy
+++ b/src/main/groovy/groovy/beans/ListenerList.groovy
@@ -93,9 +93,9 @@ import java.lang.annotation.Target
* name = a suffix for creating the add, remove, and get methods.
* Default: Name of the listener type
* In the above example, if name is set to MyListener, then the class will have an addMyListener,
- * removeMyListener, and getMyListeners methods.
+ * removeMyListener, and getMyListeners methods.
*
- * synchronize = Whether or not the methods created should be synchronized at the method level.
+ * synchronize = Whether or not the methods created should be synchronized at the method level.
* Default: false
* </pre>
* <p>
diff --git a/src/main/groovy/groovy/transform/Canonical.groovy b/src/main/groovy/groovy/transform/Canonical.groovy
index c75a0ff..8d6940e 100644
--- a/src/main/groovy/groovy/transform/Canonical.groovy
+++ b/src/main/groovy/groovy/transform/Canonical.groovy
@@ -31,7 +31,7 @@ package groovy.transform
* int age
* Date since
* Collection favItems = ['Food']
- * def object
+ * def object
* }
* def d = new Date()
* def anyObject = new Object()
@@ -76,7 +76,7 @@ package groovy.transform
* <p>
* If you want similar functionality to what this annotation provides but also require immutability, see the
* {@code @}{@link Immutable} annotation.
- *
+ *
* <p>More examples:</p>
* <pre class="groovyTestCase">
* import groovy.transform.*
@@ -106,8 +106,8 @@ package groovy.transform
* assert anotherOfficeSpace == officeSpace
*
* // equals() and hashCode() are added, so duplicate is not in Set.
- * def offices = [officeSpace, anotherOfficeSpace, theOffice] as Set
- * assert offices.size() == 2
+ * def offices = [officeSpace, anotherOfficeSpace, theOffice] as Set
+ * assert offices.size() == 2
* assert offices.name.join(',') == 'Initech office,Wernham Hogg Paper Company'
*
* @Canonical
diff --git a/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy b/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
index e678b4b..20e5a85 100644
--- a/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
+++ b/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
@@ -28,9 +28,9 @@ import org.codehaus.groovy.control.CompilePhase
*
* You can convert a String into AST using the buildFromString method.
* You can convert code into AST using the buildFromCode method.
- * You can use the AST DSL with the buildFromSpec method.
+ * You can use the AST DSL with the buildFromSpec method.
*
- * For more information, see the resources on the Groovy wiki pages.
+ * For more information, see the resources on the Groovy wiki pages.
*/
@CompileStatic
class AstBuilder {
@@ -81,7 +81,6 @@ class AstBuilder {
Are you sure you are using it correctly?''')
}
-
/**
* Builds AST based on the code within the String parameter.
*
@@ -102,16 +101,16 @@ Are you sure you are using it correctly?''')
}
/**
- * Builds AST based on the code within the String parameter. The parameter is assumed to be
- * a code block which is not legal Groovy code. A goto label is affixed to the block, compiled,
- * and the resulting BlockStatement wrapper is removed before returning a result.
+ * Builds AST based on the code within the String parameter. The parameter is assumed to be
+ * a code block which is not legal Groovy code. A goto label is affixed to the block, compiled,
+ * and the resulting BlockStatement wrapper is removed before returning a result.
* @param phase
* the {@link CompilePhase} the AST will be targeted towards. Default is {@link CompilePhase#CLASS_GENERATION}
* @param statementsOnly
* when true, only the script statements are returned. WHen false, you will
* receive back a Script class node also. Default is true.
* @param source
- * The source code String that will be compiled. The string must be a block wrapped in curly braces.
+ * The source code String that will be compiled. The string must be a block wrapped in curly braces.
* @returns a List of {@link ASTNode}.
* @throws IllegalArgumentException if source is null or empty
*/
diff --git a/src/main/groovy/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy b/src/main/groovy/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
index c4bf303..5018803 100644
--- a/src/main/groovy/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
+++ b/src/main/groovy/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
@@ -339,7 +339,6 @@ class AstSpecificationCompiler implements GroovyInterceptable {
makeNodeWithStringParameter(GStringExpression, 'gString', [String, List, List], argBlock, verbatimText)
}
-
/**
* Creates a methodPointer.
*/
diff --git a/src/main/groovy/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy b/src/main/groovy/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
index a6e0056..2ea2539 100644
--- a/src/main/groovy/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
+++ b/src/main/groovy/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
@@ -81,7 +81,6 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.constX
* package your annotation in a jar file.
*
* @since 1.8.0
- *
*/
@CompileStatic
class ASTTransformationCustomizer extends CompilationCustomizer implements CompilationUnitAware {
diff --git a/src/main/groovy/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy b/src/main/groovy/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
index 8a073bf..785bb5a 100644
--- a/src/main/groovy/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
+++ b/src/main/groovy/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
@@ -52,7 +52,7 @@ class TransformTestHelper {
* @param transform
* the transform to run when compiling the file later
* @param phase
- * the phase to run the transform in
+ * the phase to run the transform in
*/
TransformTestHelper(ASTTransformation transform, CompilePhase phase) {
this.transform = transform
diff --git a/src/main/java/groovy/beans/Bindable.java b/src/main/java/groovy/beans/Bindable.java
index 8b7fdca..b5dffb0 100644
--- a/src/main/java/groovy/beans/Bindable.java
+++ b/src/main/java/groovy/beans/Bindable.java
@@ -43,7 +43,7 @@ import java.lang.annotation.Target;
* block is wrapped with the needed code to fire off the event.
* <p>
* The following example shows how you can use this annotation on fields
- * of a class:
+ * of a class:
* <pre>
* class Person {
* @groovy.beans.Bindable
@@ -53,52 +53,52 @@ import java.lang.annotation.Target;
* def zipCode
* }
* </pre>
- * The above example will generate code that is similar to the next snippet.
- * Notice the difference between a String property and a def/Object property:
+ * The above example will generate code that is similar to the next snippet.
+ * Notice the difference between a String property and a def/Object property:
* <pre>
- * public class Person {
+ * public class Person {
* @groovy.beans.Bindable
- * private java.lang.String firstName
+ * private java.lang.String firstName
* @groovy.beans.Bindable
- * private java.lang.Object zipCode
- * final private java.beans.PropertyChangeSupport this$propertyChangeSupport
- *
+ * private java.lang.Object zipCode
+ * final private java.beans.PropertyChangeSupport this$propertyChangeSupport
+ *
* public Person() {
* this$propertyChangeSupport = new java.beans.PropertyChangeSupport(this)
* }
- *
+ *
* public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
* this$propertyChangeSupport.addPropertyChangeListener(listener)
* }
- *
+ *
* public void addPropertyChangeListener(java.lang.String name, java.beans.PropertyChangeListener listener) {
* this$propertyChangeSupport.addPropertyChangeListener(name, listener)
* }
- *
+ *
* public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
* this$propertyChangeSupport.removePropertyChangeListener(listener)
* }
- *
+ *
* public void removePropertyChangeListener(java.lang.String name, java.beans.PropertyChangeListener listener) {
* this$propertyChangeSupport.removePropertyChangeListener(name, listener)
* }
- *
+ *
* public void firePropertyChange(java.lang.String name, java.lang.Object oldValue, java.lang.Object newValue) {
* this$propertyChangeSupport.firePropertyChange(name, oldValue, newValue)
* }
- *
+ *
* public java.beans.PropertyChangeListener[] getPropertyChangeListeners() {
* return this$propertyChangeSupport.getPropertyChangeListeners()
* }
- *
+ *
* public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String name) {
* return this$propertyChangeSupport.getPropertyChangeListeners(name)
* }
- *
+ *
* public void setFirstName(java.lang.String value) {
* this.firePropertyChange('firstName', firstName, firstName = value )
* }
- *
+ *
* public void setZipCode(java.lang.Object value) {
* this.firePropertyChange('zipCode', zipCode, zipCode = value )
* }
diff --git a/src/main/java/groovy/beans/Vetoable.java b/src/main/java/groovy/beans/Vetoable.java
index 7f77537..4a7de30 100644
--- a/src/main/java/groovy/beans/Vetoable.java
+++ b/src/main/java/groovy/beans/Vetoable.java
@@ -42,7 +42,7 @@ import java.lang.annotation.Target;
* If a property with a user defined setter method is annotated the code
* block is wrapped with the needed code to fire off the event.
* <p>
- * Here is a simple example of how to annotate a class with Vetoable:
+ * Here is a simple example of how to annotate a class with Vetoable:
* <pre>
* @groovy.beans.Vetoable
* class Person {
@@ -51,53 +51,53 @@ import java.lang.annotation.Target;
* }
* </pre>
* This code is transformed by the compiler into something resembling the following
- * snippet. Notice the difference between a String and a def/Object property:
+ * snippet. Notice the difference between a String and a def/Object property:
* <pre>
- * public class Person implements groovy.lang.GroovyObject {
+ * public class Person implements groovy.lang.GroovyObject {
* private java.lang.String firstName
- * private java.lang.Object zipCode
- * final private java.beans.VetoableChangeSupport this$vetoableChangeSupport
- *
+ * private java.lang.Object zipCode
+ * final private java.beans.VetoableChangeSupport this$vetoableChangeSupport
+ *
* public Person() {
* this$vetoableChangeSupport = new java.beans.VetoableChangeSupport(this)
* }
- *
+ *
* public void addVetoableChangeListener(java.beans.VetoableChangeListener listener) {
* this$vetoableChangeSupport.addVetoableChangeListener(listener)
* }
- *
+ *
* public void addVetoableChangeListener(java.lang.String name, java.beans.VetoableChangeListener listener) {
* this$vetoableChangeSupport.addVetoableChangeListener(name, listener)
* }
- *
+ *
* public void removeVetoableChangeListener(java.beans.VetoableChangeListener listener) {
* this$vetoableChangeSupport.removeVetoableChangeListener(listener)
* }
- *
+ *
* public void removeVetoableChangeListener(java.lang.String name, java.beans.VetoableChangeListener listener) {
* this$vetoableChangeSupport.removeVetoableChangeListener(name, listener)
* }
- *
+ *
* public void fireVetoableChange(java.lang.String name, java.lang.Object oldValue, java.lang.Object newValue) throws java.beans.PropertyVetoException {
* this$vetoableChangeSupport.fireVetoableChange(name, oldValue, newValue)
* }
- *
+ *
* public java.beans.VetoableChangeListener[] getVetoableChangeListeners() {
* return this$vetoableChangeSupport.getVetoableChangeListeners()
* }
- *
+ *
* public java.beans.VetoableChangeListener[] getVetoableChangeListeners(java.lang.String name) {
* return this$vetoableChangeSupport.getVetoableChangeListeners(name)
* }
- *
+ *
* public void setFirstName(java.lang.String value) throws java.beans.PropertyVetoException {
* this.fireVetoableChange('firstName', firstName, value)
- * firstName = value
+ * firstName = value
* }
- *
+ *
* public void setZipCode(java.lang.Object value) throws java.beans.PropertyVetoException {
* this.fireVetoableChange('zipCode', zipCode, value)
- * zipCode = value
+ * zipCode = value
* }
* }
* </pre>
diff --git a/src/main/java/groovy/lang/BenchmarkInterceptor.java b/src/main/java/groovy/lang/BenchmarkInterceptor.java
index 9e64a25..cb6c015 100644
--- a/src/main/java/groovy/lang/BenchmarkInterceptor.java
+++ b/src/main/java/groovy/lang/BenchmarkInterceptor.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Interceptor that registers the timestamp of each method call
* before and after invocation. The timestamps are stored internally
- * and can be retrieved through the with the <pre>getCalls()</pre>
+ * and can be retrieved through the with the <pre>getCalls()</pre>
* and <pre>statistic()</pre> API.
* <p>
* Example usage:
@@ -42,7 +42,7 @@ import java.util.Map;
* }
* proxy.interceptor.statistic()
* </pre>
- * Which produces the following output:
+ * Which produces the following output:
* <pre>
* [[size, 4, 0], [set, 4000, 21]]
* </pre>
@@ -52,14 +52,14 @@ public class BenchmarkInterceptor implements Interceptor {
protected Map calls = new LinkedHashMap(); // keys to list of invocation times and before and after
/**
- * Returns the raw data associated with the current benchmark run.
- */
+ * Returns the raw data associated with the current benchmark run.
+ */
public Map getCalls() {
return calls;
}
-
+
/**
- * Resets all the benchmark data on this object.
+ * Resets all the benchmark data on this object.
*/
public void reset() {
calls = new HashMap();
@@ -103,9 +103,9 @@ public class BenchmarkInterceptor implements Interceptor {
}
/**
- * Returns benchmark statistics as a List<Object[]>.
+ * Returns benchmark statistics as a List<Object[]>.
* AccumulateTime is measured in milliseconds and is as accurate as
- * System.currentTimeMillis() allows it to be.
+ * System.currentTimeMillis() allows it to be.
* @return a list of lines, each item is [methodname, numberOfCalls, accumulatedTime]
*/
public List statistic() {
diff --git a/src/main/java/groovy/lang/Binding.java b/src/main/java/groovy/lang/Binding.java
index 97e2fbe..30a9062 100644
--- a/src/main/java/groovy/lang/Binding.java
+++ b/src/main/java/groovy/lang/Binding.java
@@ -88,10 +88,10 @@ public class Binding extends GroovyObjectSupport {
variables.remove(name);
}
-
+
/**
* Simple check for whether the binding contains a particular variable or not.
- *
+ *
* @param name the name of the variable to check for
*/
public boolean hasVariable(String name) {
@@ -131,5 +131,5 @@ public class Binding extends GroovyObjectSupport {
setVariable(property, newValue);
}
}
-
+
}
diff --git a/src/main/java/groovy/lang/ClosureException.java b/src/main/java/groovy/lang/ClosureException.java
index 5ceb722..4d48deb 100644
--- a/src/main/java/groovy/lang/ClosureException.java
+++ b/src/main/java/groovy/lang/ClosureException.java
@@ -25,7 +25,7 @@ public class ClosureException extends RuntimeException {
private static final long serialVersionUID = -945565055750688719L;
private final Closure closure;
-
+
public ClosureException(Closure closure, Throwable cause) {
super("Exception thrown by call to closure: " + closure + " reason: " + cause, cause);
this.closure = closure;
diff --git a/src/main/java/groovy/lang/GroovySystem.java b/src/main/java/groovy/lang/GroovySystem.java
index 6727cb4..e076d06 100644
--- a/src/main/java/groovy/lang/GroovySystem.java
+++ b/src/main/java/groovy/lang/GroovySystem.java
@@ -36,7 +36,7 @@ public final class GroovySystem {
USE_REFLECTION = true;
META_CLASS_REGISTRY = new MetaClassRegistryImpl();
}
-
+
/**
* If true then the MetaClass will only use reflection for method dispatch, property access, etc.
*/
@@ -57,7 +57,7 @@ public final class GroovySystem {
public static final Map<String, GroovyRunner> RUNNER_REGISTRY = GroovyRunnerRegistry.getInstance();
private static boolean keepJavaMetaClasses=false;
-
+
private GroovySystem() {
// Do not allow this class to be instantiated
}
@@ -70,15 +70,15 @@ public final class GroovySystem {
public static MetaClassRegistry getMetaClassRegistry() {
return META_CLASS_REGISTRY;
}
-
+
public static void setKeepJavaMetaClasses(boolean keepJavaMetaClasses) {
GroovySystem.keepJavaMetaClasses = keepJavaMetaClasses;
}
-
+
public static boolean isKeepJavaMetaClasses() {
return keepJavaMetaClasses;
}
-
+
/**
* This method can be used to ensure that no threaded created
* by a reference manager will be active. This is useful if the Groovy
diff --git a/src/main/java/groovy/lang/IllegalPropertyAccessException.java b/src/main/java/groovy/lang/IllegalPropertyAccessException.java
index 9bfc114..1702c2c 100644
--- a/src/main/java/groovy/lang/IllegalPropertyAccessException.java
+++ b/src/main/java/groovy/lang/IllegalPropertyAccessException.java
@@ -37,13 +37,13 @@ public class IllegalPropertyAccessException extends MissingPropertyException {
if (isField) propertyType = "field";
return "Can not access the "+access+" "+propertyType+" "+propertyName+" in class "+clazz.getName();
}
-
+
public IllegalPropertyAccessException(String propertyName, Class clazz, int modifiers) {
super(makeMessage(propertyName,clazz,modifiers,false),propertyName,clazz);
}
-
+
public IllegalPropertyAccessException(Field field, Class clazz) {
super(makeMessage(field.getName(),clazz,field.getModifiers(),true),field.getName(),clazz);
}
-
+
}
diff --git a/src/main/java/groovy/lang/MetaClass.java b/src/main/java/groovy/lang/MetaClass.java
index d913b20..100901c 100644
--- a/src/main/java/groovy/lang/MetaClass.java
+++ b/src/main/java/groovy/lang/MetaClass.java
@@ -133,7 +133,7 @@ public interface MetaClass extends MetaObjectProtocol {
* @param fromInsideClass Whether the call happened from the inside or the outside of a class
*/
void setAttribute(Class sender, Object receiver, String messageName, Object messageValue, boolean useSuper, boolean fromInsideClass);
-
+
/**
* Complete the initialisation process. After this method
* is called no methods should be added to the meta class.
@@ -163,7 +163,7 @@ public interface MetaClass extends MetaObjectProtocol {
*/
@Override
List<MetaMethod> getMethods();
-
+
/**
* Obtains a reference to the original AST for the MetaClass if it is available at runtime
*
@@ -177,7 +177,7 @@ public interface MetaClass extends MetaObjectProtocol {
* @return A list of MetaMethods
*/
List<MetaMethod> getMetaMethods();
-
+
/**
*
* Internal method to support Groovy runtime. Not for client usage.
diff --git a/src/main/java/groovy/lang/MetaClassRegistry.java b/src/main/java/groovy/lang/MetaClassRegistry.java
index 65a132d..ef6e206 100644
--- a/src/main/java/groovy/lang/MetaClassRegistry.java
+++ b/src/main/java/groovy/lang/MetaClassRegistry.java
@@ -33,14 +33,14 @@ import java.util.Iterator;
*
*/
public interface MetaClassRegistry {
-
+
/**
* The main function of the registry
* If a meta class exists then return it
* otherwise create one, put it in the registry and return it
*/
MetaClass getMetaClass(Class theClass);
-
+
/**
* Adds a metaclass to the registry for the given class
*
@@ -76,9 +76,9 @@ public interface MetaClassRegistry {
* @param listener - the update listener
*/
void addMetaClassRegistryChangeEventListener(MetaClassRegistryChangeEventListener listener);
-
+
/**
- * Adds a meta class change listener for constant meta classes.
+ * Adds a meta class change listener for constant meta classes.
* This listener cannot be removed!
*
* @param listener - the update listener
@@ -112,8 +112,8 @@ public interface MetaClassRegistry {
*
* @return Iterator for the constant meta classes
*/
- Iterator iterator();
-
+ Iterator iterator();
+
/**
* Class used as base for the creation of MetaClass implementations.
* The Class defaults to MetaClassImpl, if the class loading fails to
@@ -121,12 +121,12 @@ public interface MetaClassRegistry {
* the class name it is created for with the prefix
* "groovy.runtime.metaclass." By replacing the handle in the registry
* you can have any control over the creation of what MetaClass is used
- * for a class that you want to have.
+ * for a class that you want to have.
* WARNING: experimental code, likely to change soon
*/
class MetaClassCreationHandle {
private boolean disableCustomMetaClassLookup;
-
+
/**
* Creates a metaclass implementation for theClass.
* @param theClass The class to create a metaclass for
diff --git a/src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java b/src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java
index 9ab8954..6a850e9 100644
--- a/src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java
+++ b/src/main/java/groovy/lang/MetaClassRegistryChangeEventListener.java
@@ -21,7 +21,7 @@ package groovy.lang;
import java.util.EventListener;
/**
- * A listener called whenever a constant MetaClass is set, removed or replaced.
+ * A listener called whenever a constant MetaClass is set, removed or replaced.
*
* @see groovy.lang.MetaClassRegistry
* @see groovy.lang.MetaClassRegistryChangeEvent
diff --git a/src/main/java/groovy/lang/MetaMethod.java b/src/main/java/groovy/lang/MetaMethod.java
index a098205..61b03d0 100644
--- a/src/main/java/groovy/lang/MetaMethod.java
+++ b/src/main/java/groovy/lang/MetaMethod.java
@@ -59,7 +59,7 @@ public abstract class MetaMethod extends ParameterTypes implements Cloneable {
/**
* Returns the name of the method represented by this class
- *
+ *
* @return name of this method
*/
public abstract String getName();
@@ -258,7 +258,7 @@ public abstract class MetaMethod extends ParameterTypes implements Cloneable {
final String name = getName();
StringBuilder buf = new StringBuilder(name.length()+parameters.length*10);
buf.append(getReturnType().getName());
-
+
buf.append(' ');
buf.append(name);
buf.append('(');
@@ -274,14 +274,14 @@ public abstract class MetaMethod extends ParameterTypes implements Cloneable {
return signature;
}
-
+
public String getMopName() {
if (mopName == null) {
String name = getName();
CachedClass declaringClass = getDeclaringClass();
if (Modifier.isPrivate(getModifiers()))
mopName = "this$" + declaringClass.getSuperClassDistance() + "$" + name;
- else
+ else
mopName = "super$" + declaringClass.getSuperClassDistance() + "$" + name;
}
return mopName;
diff --git a/src/main/java/groovy/lang/MetaObjectProtocol.java b/src/main/java/groovy/lang/MetaObjectProtocol.java
index c215a57..b37caae 100644
--- a/src/main/java/groovy/lang/MetaObjectProtocol.java
+++ b/src/main/java/groovy/lang/MetaObjectProtocol.java
@@ -42,7 +42,7 @@ public interface MetaObjectProtocol {
* @return A list of MetaMethod instances
*/
List<MetaMethod> getMethods();
-
+
/**
* <p>Returns an object satisfying Groovy truth if the implementing MetaClass responds to
* a method with the given name and arguments types.
@@ -105,13 +105,12 @@ public interface MetaObjectProtocol {
*/
MetaMethod getStaticMetaMethod(String name, Object[] args);
-
/**
* Retrieves an instance MetaMethod for the given name and argument values, using the types of the
* argument values to establish the chosen MetaMethod
*
* @param name The name of the MetaMethod
- * @param args Array containing - 1) the argument values (using which their types are then inferred), or 2) the corresponding argument types
+ * @param args Array containing - 1) the argument values (using which their types are then inferred), or 2) the corresponding argument types
* @return A MetaMethod or null if it doesn't exist
*/
MetaMethod getMetaMethod(String name, Object[] args);
diff --git a/src/main/java/groovy/lang/MissingClassException.java b/src/main/java/groovy/lang/MissingClassException.java
index d54dcdc..0306b68 100644
--- a/src/main/java/groovy/lang/MissingClassException.java
+++ b/src/main/java/groovy/lang/MissingClassException.java
@@ -36,7 +36,7 @@ public class MissingClassException extends GroovyRuntimeException {
super("No such class: " + type + " " + message, node);
this.type = type;
}
-
+
public MissingClassException(ClassNode type, String message){
super("No such class: " + type.getName() + " " + message);
this.type = type.getName();
diff --git a/src/main/java/groovy/lang/MissingFieldException.java b/src/main/java/groovy/lang/MissingFieldException.java
index 3181936..263f767 100644
--- a/src/main/java/groovy/lang/MissingFieldException.java
+++ b/src/main/java/groovy/lang/MissingFieldException.java
@@ -18,7 +18,6 @@
*/
package groovy.lang;
-
/**
* An exception occurred if a dynamic field dispatch fails with an unknown field.
*
diff --git a/src/main/java/groovy/lang/MutableMetaClass.java b/src/main/java/groovy/lang/MutableMetaClass.java
index b361599..304eb3f 100644
--- a/src/main/java/groovy/lang/MutableMetaClass.java
+++ b/src/main/java/groovy/lang/MutableMetaClass.java
@@ -73,6 +73,6 @@ public interface MutableMetaClass extends MetaClass {
* @param metaBeanProperty The MetaBeanProperty instance
*/
void addMetaBeanProperty(MetaBeanProperty metaBeanProperty);
-
+
// TODO: Add methods like addMetaConstructor, addMetaAttribute, addMetaAnnotation etc.
}
diff --git a/src/main/java/groovy/lang/PropertyValue.java b/src/main/java/groovy/lang/PropertyValue.java
index ac77b54..bd42ad1 100644
--- a/src/main/java/groovy/lang/PropertyValue.java
+++ b/src/main/java/groovy/lang/PropertyValue.java
@@ -46,4 +46,3 @@ public class PropertyValue {
mp.setProperty(bean, value);
}
}
-
diff --git a/src/main/java/groovy/lang/ReadOnlyPropertyException.java b/src/main/java/groovy/lang/ReadOnlyPropertyException.java
index cc229f9..bf6e14e 100644
--- a/src/main/java/groovy/lang/ReadOnlyPropertyException.java
+++ b/src/main/java/groovy/lang/ReadOnlyPropertyException.java
@@ -18,7 +18,6 @@
*/
package groovy.lang;
-
/**
* This exception is thrown if an attempt is made to set a read only property
*/
diff --git a/src/main/java/groovy/lang/SpreadMap.java b/src/main/java/groovy/lang/SpreadMap.java
index 6fa397c..e147dd2 100644
--- a/src/main/java/groovy/lang/SpreadMap.java
+++ b/src/main/java/groovy/lang/SpreadMap.java
@@ -78,7 +78,7 @@ public class SpreadMap extends HashMap {
}
public boolean equals(SpreadMap that) {
- if (that == null) return false;
+ if (that == null) return false;
if (size() == that.size()) {
for (Object e : entrySet()) {
diff --git a/src/main/java/groovy/lang/Tuple10.java b/src/main/java/groovy/lang/Tuple10.java
index 5356f13..bcd8aab 100644
--- a/src/main/java/groovy/lang/Tuple10.java
+++ b/src/main/java/groovy/lang/Tuple10.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
diff --git a/src/main/java/groovy/lang/Tuple11.java b/src/main/java/groovy/lang/Tuple11.java
index 42e580c..0095b12 100644
--- a/src/main/java/groovy/lang/Tuple11.java
+++ b/src/main/java/groovy/lang/Tuple11.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
diff --git a/src/main/java/groovy/lang/Tuple12.java b/src/main/java/groovy/lang/Tuple12.java
index 4be67ba..244507d 100644
--- a/src/main/java/groovy/lang/Tuple12.java
+++ b/src/main/java/groovy/lang/Tuple12.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
@@ -40,7 +39,6 @@ public final class Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ex
private final T11 v11;
private final T12 v12;
-
public Tuple12(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12) {
super(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
diff --git a/src/main/java/groovy/lang/Tuple13.java b/src/main/java/groovy/lang/Tuple13.java
index e40b1a6..002070a 100644
--- a/src/main/java/groovy/lang/Tuple13.java
+++ b/src/main/java/groovy/lang/Tuple13.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
@@ -41,7 +40,6 @@ public final class Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T1
private final T12 v12;
private final T13 v13;
-
public Tuple13(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13) {
super(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13);
diff --git a/src/main/java/groovy/lang/Tuple14.java b/src/main/java/groovy/lang/Tuple14.java
index c0cfb16..866bf4c 100644
--- a/src/main/java/groovy/lang/Tuple14.java
+++ b/src/main/java/groovy/lang/Tuple14.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
diff --git a/src/main/java/groovy/lang/Tuple15.java b/src/main/java/groovy/lang/Tuple15.java
index 02f91e3..907907e 100644
--- a/src/main/java/groovy/lang/Tuple15.java
+++ b/src/main/java/groovy/lang/Tuple15.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
diff --git a/src/main/java/groovy/lang/Tuple16.java b/src/main/java/groovy/lang/Tuple16.java
index 64ae7fc..270bb19 100644
--- a/src/main/java/groovy/lang/Tuple16.java
+++ b/src/main/java/groovy/lang/Tuple16.java
@@ -17,7 +17,6 @@
* under the License.
*/
-
package groovy.lang;
/**
diff --git a/src/main/java/groovy/lang/Writable.java b/src/main/java/groovy/lang/Writable.java
index 209783b..fde3be3 100644
--- a/src/main/java/groovy/lang/Writable.java
+++ b/src/main/java/groovy/lang/Writable.java
@@ -50,5 +50,5 @@ public interface Writable {
* @throws IOException if an error occurred while outputting data to the writer
*/
Writer writeTo(Writer out) throws IOException;
-
+
}
diff --git a/src/main/java/groovy/namespace/QName.java b/src/main/java/groovy/namespace/QName.java
index a7d7ed2..28181af 100644
--- a/src/main/java/groovy/namespace/QName.java
+++ b/src/main/java/groovy/namespace/QName.java
@@ -287,4 +287,4 @@ public class QName implements Serializable {
result = 29 * result + localPart.hashCode();
return result;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/groovy/time/Duration.java b/src/main/java/groovy/time/Duration.java
index 20736df..94d64b7 100644
--- a/src/main/java/groovy/time/Duration.java
+++ b/src/main/java/groovy/time/Duration.java
@@ -36,7 +36,7 @@ public class Duration extends BaseDuration {
public Duration(final int days, final int hours, final int minutes, final int seconds, final int millis) {
super(days, hours, minutes, seconds, millis);
}
-
+
public Duration plus(final Duration rhs) {
return new Duration(this.getDays() + rhs.getDays(), this.getHours() + rhs.getHours(),
this.getMinutes() + rhs.getMinutes(), this.getSeconds() + rhs.getSeconds(),
@@ -46,42 +46,42 @@ public class Duration extends BaseDuration {
public Duration plus(final TimeDuration rhs) {
return rhs.plus(this);
}
-
+
public DatumDependentDuration plus(final DatumDependentDuration rhs) {
return rhs.plus(this);
}
-
+
public Duration minus(final Duration rhs) {
return new Duration(this.getDays() - rhs.getDays(), this.getHours() - rhs.getHours(),
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
public TimeDuration minus(final TimeDuration rhs) {
return new TimeDuration(this.getDays() - rhs.getDays(), this.getHours() - rhs.getHours(),
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
public DatumDependentDuration minus(final DatumDependentDuration rhs) {
return new DatumDependentDuration(-rhs.getYears(), -rhs.getMonths(),
this.getDays() - rhs.getDays(), this.getHours() - rhs.getHours(),
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
public TimeDatumDependentDuration minus(final TimeDatumDependentDuration rhs) {
return new TimeDatumDependentDuration(-rhs.getYears(), -rhs.getMonths(),
this.getDays() - rhs.getDays(), this.getHours() - rhs.getHours(),
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
@Override
public long toMilliseconds() {
return ((((((long)(this.getDays() * 24 ) + this.getHours()) * 60 + this.getMinutes()) * 60) + this.getSeconds()) * 1000) + this.getMillis();
}
-
+
@Override
public Date getAgo() {
final Calendar cal = Calendar.getInstance();
@@ -96,10 +96,10 @@ public class Duration extends BaseDuration {
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
-
+
return new Date(cal.getTimeInMillis());
}
-
+
@Override
public From getFrom() {
return new From() {
diff --git a/src/main/java/groovy/time/TimeDatumDependentDuration.java b/src/main/java/groovy/time/TimeDatumDependentDuration.java
index 1ccfbe5..e8b513e 100644
--- a/src/main/java/groovy/time/TimeDatumDependentDuration.java
+++ b/src/main/java/groovy/time/TimeDatumDependentDuration.java
@@ -29,7 +29,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
public TimeDatumDependentDuration(int years, int months, int days, int hours, int minutes, int seconds, int millis) {
super(years, months, days, hours, minutes, seconds, millis);
}
-
+
@Override
public DatumDependentDuration plus(final Duration rhs) {
return new TimeDatumDependentDuration(this.getYears(), this.getMonths(),
@@ -37,7 +37,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
this.getMinutes() + rhs.getMinutes(), this.getSeconds() + rhs.getSeconds(),
this.getMillis() + rhs.getMillis());
}
-
+
@Override
public DatumDependentDuration plus(final DatumDependentDuration rhs) {
return new TimeDatumDependentDuration(this.getYears() + rhs.getYears(), this.getMonths() + rhs.getMonths(),
@@ -45,7 +45,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
this.getMinutes() + rhs.getMinutes(), this.getSeconds() + rhs.getSeconds(),
this.getMillis() + rhs.getMillis());
}
-
+
@Override
public DatumDependentDuration minus(final Duration rhs) {
return new TimeDatumDependentDuration(this.getYears(), this.getMonths(),
@@ -53,7 +53,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
@Override
public DatumDependentDuration minus(final DatumDependentDuration rhs) {
return new TimeDatumDependentDuration(this.getYears() - rhs.getYears(), this.getMonths() - rhs.getMonths(),
@@ -61,7 +61,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
@Override
public From getFrom() {
return new From() {
@@ -76,7 +76,7 @@ public class TimeDatumDependentDuration extends DatumDependentDuration {
cal.add(Calendar.MINUTE, TimeDatumDependentDuration.this.getMinutes());
cal.add(Calendar.SECOND, TimeDatumDependentDuration.this.getSeconds());
cal.add(Calendar.MILLISECOND, TimeDatumDependentDuration.this.getMillis());
-
+
return cal.getTime();
}
};
diff --git a/src/main/java/groovy/time/TimeDuration.java b/src/main/java/groovy/time/TimeDuration.java
index 71e741b..93bcfd1 100644
--- a/src/main/java/groovy/time/TimeDuration.java
+++ b/src/main/java/groovy/time/TimeDuration.java
@@ -39,18 +39,18 @@ public class TimeDuration extends Duration {
public TimeDuration(final int hours, final int minutes, final int seconds, final int millis) {
super(0, hours, minutes, seconds, millis);
}
-
+
public TimeDuration(final int days, final int hours, final int minutes, final int seconds, final int millis) {
super(days, hours, minutes, seconds, millis);
}
-
+
@Override
public Duration plus(final Duration rhs) {
return new TimeDuration(this.getDays() + rhs.getDays(), this.getHours() + rhs.getHours(),
this.getMinutes() + rhs.getMinutes(), this.getSeconds() + rhs.getSeconds(),
this.getMillis() + rhs.getMillis());
}
-
+
@Override
public DatumDependentDuration plus(final DatumDependentDuration rhs) {
return new TimeDatumDependentDuration(rhs.getYears(), rhs.getMonths(),
@@ -58,14 +58,14 @@ public class TimeDuration extends Duration {
this.getMinutes() + rhs.getMinutes(), this.getSeconds() + rhs.getSeconds(),
this.getMillis() + rhs.getMillis());
}
-
+
@Override
public Duration minus(final Duration rhs) {
return new TimeDuration(this.getDays() - rhs.getDays(), this.getHours() - rhs.getHours(),
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
@Override
public DatumDependentDuration minus(final DatumDependentDuration rhs) {
return new TimeDatumDependentDuration(-rhs.getYears(), -rhs.getMonths(),
@@ -73,7 +73,7 @@ public class TimeDuration extends Duration {
this.getMinutes() - rhs.getMinutes(), this.getSeconds() - rhs.getSeconds(),
this.getMillis() - rhs.getMillis());
}
-
+
@Override
public Date getAgo() {
final Calendar cal = Calendar.getInstance();
@@ -83,7 +83,7 @@ public class TimeDuration extends Duration {
cal.add(Calendar.MINUTE, -this.getMinutes());
cal.add(Calendar.SECOND, -this.getSeconds());
cal.add(Calendar.MILLISECOND, -this.getMillis());
-
+
return cal.getTime();
}
@@ -99,7 +99,7 @@ public class TimeDuration extends Duration {
cal.add(Calendar.MINUTE, TimeDuration.this.getMinutes());
cal.add(Calendar.SECOND, TimeDuration.this.getSeconds());
cal.add(Calendar.MILLISECOND, TimeDuration.this.getMillis());
-
+
return cal.getTime();
}
};
diff --git a/src/main/java/groovy/time/package.html b/src/main/java/groovy/time/package.html
index d62193d..c582fd2 100644
--- a/src/main/java/groovy/time/package.html
+++ b/src/main/java/groovy/time/package.html
@@ -37,12 +37,12 @@
// application on numbers:
println 1.minute.from.now
println 10.days.ago
-
+
// application on dates
def someDate = new Date()
println someDate - 3.months
}</pre>
-
+
@see groovy.time.TimeCategory
</body>
</html>
diff --git a/src/main/java/groovy/transform/AnnotationCollector.java b/src/main/java/groovy/transform/AnnotationCollector.java
index 4112825..8767b91 100644
--- a/src/main/java/groovy/transform/AnnotationCollector.java
+++ b/src/main/java/groovy/transform/AnnotationCollector.java
@@ -24,15 +24,15 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * The AnnotationCollector can be used to define aliases for groups of
- * annotations. The Alias needs to be a class or annotation annotated with
- * AnnotationCollector, otherwise nothing is required. The alias will be
- * replaced on the AST level and will never appear in later. Any members of the
+ * The AnnotationCollector can be used to define aliases for groups of
+ * annotations. The Alias needs to be a class or annotation annotated with
+ * AnnotationCollector, otherwise nothing is required. The alias will be
+ * replaced on the AST level and will never appear in later. Any members of the
* class or annotation will be ignored, but could be used by a custom processor.
* Annotation arguments are mapped to the aliased annotations
* if existing. Should the default processor not be able to map one of the
- * arguments and error will be given. Is this not wished or if you want a
- * different mapping a custom processor has to be used. There are two ways of
+ * arguments and error will be given. Is this not wished or if you want a
+ * different mapping a custom processor has to be used. There are two ways of
* using the alias. The first way is by providing the annotations as list/array:
* <pre class="groovyTestCase">
* import groovy.transform.*
@@ -47,7 +47,7 @@ import java.lang.annotation.Target;
* assert new Foo(a: 1, b: 2).toString() == "Foo(2)"
* </pre>
* In the example above we have Alias as the alias annotation and an argument
- * excludes which will be mapped to ToString and EqualsAndHashCode. Immutable
+ * excludes which will be mapped to ToString and EqualsAndHashCode. Immutable
* doesn't have excludes, thus nothing will be done there.<br>
* The other way is to add annotations to the alias:
* <pre class="groovyTestCase">
@@ -68,11 +68,11 @@ import java.lang.annotation.Target;
* In the example above we have again Alias as the alias annotation, but
* this time the argument is part of the alias. Instead of mapping excludes to
* ToString as well as EqualsAndHashCode, only ToString will have the excludes.
- * Again the alias can have an argument excludes, which would overwrite the
+ * Again the alias can have an argument excludes, which would overwrite the
* excludes given in from the definition and be mapped to ToString as well as
* EqualsAndHashCode.
* If both ways are combined, then the list overwrites annotation usage.
- * NOTE: The aliasing does not support aliasing of aliased annotations.
+ * NOTE: The aliasing does not support aliasing of aliased annotations.
* <p>More examples:</p>
* <pre class="groovyTestCase">
* //--------------------------------------------------------------------------
@@ -94,14 +94,14 @@ import java.lang.annotation.Target;
* assert User.class.annotations.size() == 2
*
*
- * // We can use the attributes from the
+ * // We can use the attributes from the
* // grouped annotations.
* @Simple(excludes = 'street')
* class Address {
* String street, town
* }
*
- * def address = new Address(street: 'Evergreen Terrace', town: 'Springfield')
+ * def address = new Address(street: 'Evergreen Terrace', town: 'Springfield')
* assert address.toString() == 'Address(Springfield)'
* </pre>
* <pre class="groovyTestCase">
@@ -113,9 +113,9 @@ import java.lang.annotation.Target;
*
* class SimpleProcessor extends AnnotationCollectorTransform {
*
- * public List<AnnotationNode> visit(AnnotationNode collector,
- * AnnotationNode aliasAnnotationUsage,
- * AnnotatedNode aliasAnnotated,
+ * public List<AnnotationNode> visit(AnnotationNode collector,
+ * AnnotationNode aliasAnnotationUsage,
+ * AnnotatedNode aliasAnnotated,
* SourceUnit source) {
*
* // Get attributes and attribute value for dontUse.
@@ -169,7 +169,7 @@ import java.lang.annotation.Target;
* def user = new User(username: 'mrhaki')
* assert user.toString() == 'User(mrhaki)'
* </pre>
- *
+ *
* @see org.codehaus.groovy.transform.AnnotationCollectorTransform
* @since 2.1.0
*/
@@ -178,9 +178,9 @@ import java.lang.annotation.Target;
@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
public @interface AnnotationCollector {
/**
- * Processor used for computing custom logic or the list of annotations, or
+ * Processor used for computing custom logic or the list of annotations, or
* both. The default is org.codehaus.groovy.transform.AnnotationCollectorTransform.
- * Custom processors need to extend that class.
+ * Custom processors need to extend that class.
*/
String processor() default "org.codehaus.groovy.transform.AnnotationCollectorTransform";
diff --git a/src/main/java/groovy/transform/BaseScript.java b/src/main/java/groovy/transform/BaseScript.java
index bc058cc..2f37d9b 100644
--- a/src/main/java/groovy/transform/BaseScript.java
+++ b/src/main/java/groovy/transform/BaseScript.java
@@ -46,9 +46,9 @@ import java.lang.annotation.Target;
* assert theMeaningOfLife == 42
* assert theMeaningOfLife == baseScript.theMeaningOfLife
* </pre>
- * In this example, the base script of the current script will be changed to
+ * In this example, the base script of the current script will be changed to
* <code>CustomScript</code> allowing usage of <code>getTheMeaningOfLife()</code>
- * method. <code>baseScript</code> variable will become typed shortcut for
+ * method. <code>baseScript</code> variable will become typed shortcut for
* <code>this</code> object which enables better IDE support.
* </p><p>
* The custom base script may implement the run() method and specify a different
diff --git a/src/main/java/groovy/transform/InheritConstructors.java b/src/main/java/groovy/transform/InheritConstructors.java
index 93a01fd..5479201 100644
--- a/src/main/java/groovy/transform/InheritConstructors.java
+++ b/src/main/java/groovy/transform/InheritConstructors.java
@@ -49,7 +49,7 @@ import java.lang.annotation.Target;
*
* def js = new PersonAge('John', 'Smith')
* js.age = 25
- *
+ *
* assert "$js.last, $js.first is $js.age years old" == 'SMITH, John is 25 years old'
* </pre>
* for this case, the <code>PersonAge</code> class will be
diff --git a/src/main/java/groovy/transform/Memoized.java b/src/main/java/groovy/transform/Memoized.java
index 6ba204d..ad3a848 100644
--- a/src/main/java/groovy/transform/Memoized.java
+++ b/src/main/java/groovy/transform/Memoized.java
@@ -132,12 +132,12 @@ import java.lang.annotation.Target;
@Target({ ElementType.METHOD })
@GroovyASTTransformationClass("org.codehaus.groovy.transform.MemoizedASTTransformation")
public @interface Memoized {
-
+
/**
* Number of cached return values to protect from garbage collection.
*/
int protectedCacheSize() default 0;
-
+
/**
* The maximum size the cache can grow to.
*/
diff --git a/src/main/java/groovy/transform/Synchronized.java b/src/main/java/groovy/transform/Synchronized.java
index d7c498a..b3f88e2 100644
--- a/src/main/java/groovy/transform/Synchronized.java
+++ b/src/main/java/groovy/transform/Synchronized.java
@@ -138,7 +138,7 @@ import java.lang.annotation.Target;
* def tc1 = Thread.start {
* 100.times {
* util.workOnCounter()
- * sleep 20
+ * sleep 20
* util.workOnList()
* sleep 10
* }
@@ -146,7 +146,7 @@ import java.lang.annotation.Target;
* def tc2 = Thread.start {
* 100.times {
* util.workOnCounter()
- * sleep 10
+ * sleep 10
* util.workOnList()
* sleep 15
* }
diff --git a/src/main/java/groovy/transform/ToString.java b/src/main/java/groovy/transform/ToString.java
index 2899e10..81e9f36 100644
--- a/src/main/java/groovy/transform/ToString.java
+++ b/src/main/java/groovy/transform/ToString.java
@@ -107,7 +107,7 @@ import java.lang.annotation.Target;
* </pre>
* <p>More examples:</p>
* <pre class="groovyTestCase">
- * //--------------------------------------------------------------------------
+ * //--------------------------------------------------------------------------
* // Most simple implementation of toString.
* import groovy.transform.ToString
*
@@ -123,7 +123,7 @@ import java.lang.annotation.Target;
* assert person.toString() == 'Person(mrhaki, [Groovy, Java])'
* </pre>
* <pre class="groovyTestCase">
- * //--------------------------------------------------------------------------
+ * //--------------------------------------------------------------------------
* // includeNames to output the names of the properties.
* import groovy.transform.ToString
*
@@ -155,7 +155,7 @@ import java.lang.annotation.Target;
* assert person.toString() == 'Person(name:mrhaki, likes:[Groovy, Java], active:false)'
* </pre>
* <pre>
- * //--------------------------------------------------------------------------
+ * //--------------------------------------------------------------------------
* // Use includeSuper to include properties from super class in output.
* import groovy.transform.ToString
*
@@ -176,7 +176,7 @@ import java.lang.annotation.Target;
* assert student.toString() == 'Student(courses:[IT, Business], super:Person(name:mrhaki, likes:[Groovy, Java]))'
* </pre>
* <pre class="groovyTestCase">
- * //--------------------------------------------------------------------------
+ * //--------------------------------------------------------------------------
* // excludes active field and likes property from output
* import groovy.transform.ToString
*
@@ -247,7 +247,7 @@ import java.lang.annotation.Target;
*
* assert course.toString() == 'com.mrhaki.blog.groovy.Course(Groovy 101, 200)'
* assert course.title == 'Grails with REST'
- * </pre>
+ * </pre>
*
* @see groovy.transform.Immutable
* @see groovy.transform.Canonical
diff --git a/src/main/java/groovy/transform/WithWriteLock.java b/src/main/java/groovy/transform/WithWriteLock.java
index fbce01a..2aa8d29 100644
--- a/src/main/java/groovy/transform/WithWriteLock.java
+++ b/src/main/java/groovy/transform/WithWriteLock.java
@@ -98,9 +98,9 @@ import java.lang.annotation.Target;
public @interface WithWriteLock {
/**
* @return if a user specified lock object with the given name should be used
- * the lock object must exist. If the annotated method is static then the
- * lock object must be static. If the annotated method is not static then
- * the lock object must not be static.
+ * the lock object must exist. If the annotated method is static then the
+ * lock object must be static. If the annotated method is not static then
+ * the lock object must not be static.
*/
String value () default "";
}
diff --git a/src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java b/src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java
index 2d33d01..a52249f 100644
--- a/src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java
+++ b/src/main/java/groovy/transform/stc/MapEntryOrKeyValue.java
@@ -85,7 +85,7 @@ public class MapEntryOrKeyValue extends ClosureSignatureHint {
}
return Arrays.asList(firstSig, secondSig);
}
-
+
private static final class Options {
final int parameterIndex;
final boolean generateIndex;
@@ -94,7 +94,7 @@ public class MapEntryOrKeyValue extends ClosureSignatureHint {
this.parameterIndex = parameterIndex;
this.generateIndex = generateIndex;
}
-
+
static Options parse(MethodNode mn, ASTNode source, String[] options) throws IncorrectTypeHintException {
int pIndex = 0;
boolean generateIndex = false;
@@ -116,5 +116,5 @@ public class MapEntryOrKeyValue extends ClosureSignatureHint {
}
return new Options(pIndex, generateIndex);
}
- }
+ }
}
diff --git a/src/main/java/groovy/ui/GroovySocketServer.java b/src/main/java/groovy/ui/GroovySocketServer.java
index 239c0ba..40af52b 100644
--- a/src/main/java/groovy/ui/GroovySocketServer.java
+++ b/src/main/java/groovy/ui/GroovySocketServer.java
@@ -38,14 +38,14 @@ import java.util.regex.Pattern;
/**
* Simple server that executes supplied script against a socket.
* <p>
- * Typically this is used from the groovy command line agent but it can be
+ * Typically this is used from the groovy command line agent but it can be
* invoked programmatically. To run this program from the command line please
* refer to the command line documentation at
* <a href="http://docs.groovy-lang.org/docs/latest/html/documentation/#_running_groovy_from_the_commandline">
* Running Groovy from the commandline</a>.
* <p>
- * Here is an example of how to use this class to open a listening socket on the server,
- * listen for incoming data, and then echo the data back to the client in reverse order:
+ * Here is an example of how to use this class to open a listening socket on the server,
+ * listen for incoming data, and then echo the data back to the client in reverse order:
* <pre>
* new GroovySocketServer(
* new GroovyShell(), // evaluator
@@ -56,9 +56,9 @@ import java.util.regex.Pattern;
* </pre>
* There are several variables in the script binding:
* <ul>
- * <li>line - The data from the socket</li>
- * <li>out - The output PrintWriter, should you need it for some reason.</li>
- * <li>socket - The socket, should you need it for some reason.</li>
+ * <li>line - The data from the socket</li>
+ * <li>out - The output PrintWriter, should you need it for some reason.</li>
+ * <li>socket - The socket, should you need it for some reason.</li>
* </ul>
*/
public class GroovySocketServer implements Runnable {
@@ -120,10 +120,10 @@ public class GroovySocketServer implements Runnable {
/**
* This creates and starts the socket server on a new Thread. There is no need to call run or spawn
- * a new thread yourself.
+ * a new thread yourself.
* @param groovy
- * The GroovyShell object that evaluates the incoming text. If you need additional classes in the
- * classloader then configure that through this object.
+ * The GroovyShell object that evaluates the incoming text. If you need additional classes in the
+ * classloader then configure that through this object.
* @param source
* GroovyCodeSource for the Groovy script
* @param autoOutput
@@ -131,7 +131,7 @@ public class GroovySocketServer implements Runnable {
* @param port
* the port to listen on
* @since 2.3.0
- */
+ */
public GroovySocketServer(GroovyShell groovy, GroovyCodeSource source, boolean autoOutput, int port) {
this.groovy = groovy;
this.source = source;
@@ -139,7 +139,7 @@ public class GroovySocketServer implements Runnable {
try {
url = new URL("http", InetAddress.getLocalHost().getHostAddress(), port, "/");
System.out.println("groovy is listening on port " + port);
- } catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
new Thread(this).start();
@@ -147,7 +147,7 @@ public class GroovySocketServer implements Runnable {
/**
* Runs this server. There is typically no need to call this method, as the object's constructor
- * creates a new thread and runs this object automatically.
+ * creates a new thread and runs this object automatically.
*/
@Override
public void run() {
@@ -167,14 +167,14 @@ public class GroovySocketServer implements Runnable {
e.printStackTrace();
}
}
-
+
static class GroovyClientConnection implements Runnable {
private Script script;
private Socket socket;
private BufferedReader reader;
private PrintWriter writer;
private boolean autoOutputFlag;
-
+
GroovyClientConnection(Script script, boolean autoOutput,Socket socket) throws IOException {
this.script = script;
this.autoOutputFlag = autoOutput;
diff --git a/src/main/java/groovy/util/Eval.java b/src/main/java/groovy/util/Eval.java
index dba875d..d541f60 100644
--- a/src/main/java/groovy/util/Eval.java
+++ b/src/main/java/groovy/util/Eval.java
@@ -26,19 +26,19 @@ import org.codehaus.groovy.control.CompilationFailedException;
* Allow easy integration from Groovy into Java through convenience methods.
* <p>
* This class is a simple helper on top of GroovyShell. You can use it to evaluate small
- * Groovy scripts that don't need large Binding objects. For example, this script
- * executes with no errors:
+ * Groovy scripts that don't need large Binding objects. For example, this script
+ * executes with no errors:
* <pre class="groovyTestCase">
* assert Eval.me(' 2 * 4 + 2') == 10
* assert Eval.x(2, ' x * 4 + 2') == 10
* </pre>
- *
+ *
* @see GroovyShell
*/
public class Eval {
/**
- * Evaluates the specified String expression and returns the result. For example:
+ * Evaluates the specified String expression and returns the result. For example:
* <pre class="groovyTestCase">
* assert Eval.me(' 2 * 4 + 2') == 10
* </pre>
@@ -52,7 +52,7 @@ public class Eval {
/**
* Evaluates the specified String expression and makes the parameter available inside
- * the script, returning the result. For example, this code binds the 'x' variable:
+ * the script, returning the result. For example, this code binds the 'x' variable:
* <pre class="groovyTestCase">
* assert Eval.me('x', 2, ' x * 4 + 2') == 10
* </pre>
@@ -69,8 +69,8 @@ public class Eval {
/**
* Evaluates the specified String expression and makes the parameter available inside
- * the script bound to a variable named 'x', returning the result. For example, this
- * code executes without failure:
+ * the script bound to a variable named 'x', returning the result. For example, this
+ * code executes without failure:
* <pre class="groovyTestCase">
* assert Eval.x(2, ' x * 4 + 2') == 10
* </pre>
@@ -84,8 +84,8 @@ public class Eval {
/**
* Evaluates the specified String expression and makes the first two parameters available inside
- * the script bound to variables named 'x' and 'y' respectively, returning the result. For example,
- * this code executes without failure:
+ * the script bound to variables named 'x' and 'y' respectively, returning the result. For example,
+ * this code executes without failure:
* <pre class="groovyTestCase">
* assert Eval.xy(2, 4, ' x * y + 2') == 10
* </pre>
@@ -103,8 +103,8 @@ public class Eval {
/**
* Evaluates the specified String expression and makes the first three parameters available inside
- * the script bound to variables named 'x', 'y', and 'z' respectively, returning the result. For
- * example, this code executes without failure:
+ * the script bound to variables named 'x', 'y', and 'z' respectively, returning the result. For
+ * example, this code executes without failure:
* <pre class="groovyTestCase">
* assert Eval.xyz(2, 4, 2, ' x * y + z') == 10
* </pre>
diff --git a/src/main/java/groovy/util/FactoryBuilderSupport.java b/src/main/java/groovy/util/FactoryBuilderSupport.java
index c9b32b0..2c6ad9c 100644
--- a/src/main/java/groovy/util/FactoryBuilderSupport.java
+++ b/src/main/java/groovy/util/FactoryBuilderSupport.java
@@ -1140,7 +1140,7 @@ public abstract class FactoryBuilderSupport extends Binding {
/**
* Restores the state of the current builder to the same state as an older build.
- *
+ *
* Caution, this will destroy rather than merge the current build context if there is any,
* @param data the data retrieved from a compatible getContinuationData call
*/
diff --git a/src/main/java/groovy/util/NodeBuilder.java b/src/main/java/groovy/util/NodeBuilder.java
index cb9baed..73faf7b 100644
--- a/src/main/java/groovy/util/NodeBuilder.java
+++ b/src/main/java/groovy/util/NodeBuilder.java
@@ -21,7 +21,7 @@ package groovy.util;
import java.util.Map;
/**
- * A helper class for creating nested trees of Node objects for
+ * A helper class for creating nested trees of Node objects for
* handling arbitrary data
*/
public class NodeBuilder extends BuilderSupport {
diff --git a/src/main/java/groovy/util/ObjectGraphBuilder.java b/src/main/java/groovy/util/ObjectGraphBuilder.java
index ab65eca..7cab1c7 100644
--- a/src/main/java/groovy/util/ObjectGraphBuilder.java
+++ b/src/main/java/groovy/util/ObjectGraphBuilder.java
@@ -90,7 +90,7 @@ public class ObjectGraphBuilder extends FactoryBuilderSupport {
* Returns the current name of the 'bean' node.
*/
public String getBeanFactoryName() {
- return beanFactoryName;
+ return beanFactoryName;
}
/**
diff --git a/src/main/java/groovy/util/Proxy.java b/src/main/java/groovy/util/Proxy.java
index 63af130..83f34eb 100644
--- a/src/main/java/groovy/util/Proxy.java
+++ b/src/main/java/groovy/util/Proxy.java
@@ -60,7 +60,7 @@ public class Proxy extends GroovyObjectSupport {
return InvokerHelper.invokeMethod(adaptee, name, args);
}
}
-
+
public Iterator iterator() {
return InvokerHelper.asIterator(adaptee);
}
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 9a7aa5d..14e2380 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -1369,7 +1369,6 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
throw createParsingFailedException("Unsupported switch expression label: " + ctx.getText(), ctx);
}
-
// } statement -------------------------------------------------------------
@Override
@@ -2418,7 +2417,6 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
Expression baseExpr = (Expression) this.visit(ctx.expression());
-
if (hasArgumentList || hasCommandArgument) {
if (baseExpr instanceof BinaryExpression) {
if (!"[".equals(((BinaryExpression) baseExpr).getOperation().getText()) && !isInsideParentheses(baseExpr)) {
@@ -2634,7 +2632,6 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> {
Expression namePartExpr = this.visitNamePart(ctx.namePart());
GenericsType[] genericsTypes = this.visitNonWildcardTypeArguments(ctx.nonWildcardTypeArguments());
-
if (asBoolean(ctx.DOT())) {
boolean isSafeChain = this.isTrue(baseExpr, PATH_EXPRESSION_BASE_EXPR_SAFE_CHAIN);
return this.createDotExpression(ctx, baseExpr, namePartExpr, genericsTypes, isSafeChain);
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java b/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
index 2002ecd..cd22bc3 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
@@ -205,7 +205,6 @@ public class TryWithResourcesASTTransformation {
);
astBuilder.appendStatementsToBlockStatement(blockStatement, primaryExcDeclarationStatement);
-
// The generated try-catch-finally statement
String firstResourceIdentifierName =
((DeclarationExpression) tryCatchStatement.getResourceStatement(0).getExpression()).getLeftExpression().getText();
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java b/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
index c269cb3..1fbb413 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
@@ -104,7 +104,6 @@ public class DescriptiveErrorStrategy extends BailErrorStrategy {
notifyErrorListeners(recognizer, this.createInputMismatchErrorMessage(recognizer, e), e);
}
-
protected String createFailedPredicateErrorMessage(Parser recognizer,
FailedPredicateException e) {
return e.getMessage();
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java b/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
index 1600a5c..9e80d90 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
@@ -43,7 +43,6 @@ public abstract class AtnManager {
DFA_CACHE_THRESHOLD = t;
}
-
public abstract ATN getATN();
protected abstract boolean shouldClearDfaCache();
diff --git a/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/LinkedDeque.java b/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/LinkedDeque.java
index d2d3004..052219a 100644
--- a/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/LinkedDeque.java
+++ b/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/LinkedDeque.java
@@ -287,7 +287,6 @@ final class LinkedDeque<E extends Linked<E>> extends AbstractCollection<E> imple
return offerLast(e);
}
-
@Override
public void addFirst(E e) {
if (!offerFirst(e)) {
diff --git a/src/main/java/org/codehaus/groovy/GroovyExceptionInterface.java b/src/main/java/org/codehaus/groovy/GroovyExceptionInterface.java
index bfff301..b505e78 100644
--- a/src/main/java/org/codehaus/groovy/GroovyExceptionInterface.java
+++ b/src/main/java/org/codehaus/groovy/GroovyExceptionInterface.java
@@ -27,5 +27,5 @@ public interface GroovyExceptionInterface {
boolean isFatal();
void setFatal( boolean fatal );
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/antlr/EnumHelper.java b/src/main/java/org/codehaus/groovy/antlr/EnumHelper.java
index 803bd0b..2f0ec08 100644
--- a/src/main/java/org/codehaus/groovy/antlr/EnumHelper.java
+++ b/src/main/java/org/codehaus/groovy/antlr/EnumHelper.java
@@ -31,7 +31,7 @@ import org.objectweb.asm.Opcodes;
public class EnumHelper {
private static final int FS = Opcodes.ACC_FINAL | Opcodes.ACC_STATIC;
private static final int PUBLIC_FS = Opcodes.ACC_PUBLIC | FS;
-
+
public static ClassNode makeEnumNode(String name, int modifiers, ClassNode[] interfaces, ClassNode outerClass) {
modifiers = modifiers | Opcodes.ACC_FINAL | Opcodes.ACC_ENUM;
ClassNode enumClass;
@@ -42,7 +42,7 @@ public class EnumHelper {
modifiers |= Opcodes.ACC_STATIC;
enumClass = new InnerClassNode(outerClass,name,modifiers,null,interfaces,MixinNode.EMPTY_ARRAY);
}
-
+
// set super class and generics info
// "enum X" -> class X extends Enum<X>
GenericsType gt = new GenericsType(enumClass);
@@ -50,7 +50,7 @@ public class EnumHelper {
superClass.setGenericsTypes(new GenericsType[]{gt});
enumClass.setSuperClass(superClass);
superClass.setRedirect(ClassHelper.Enum_Type);
-
+
return enumClass;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/InnerClassNode.java b/src/main/java/org/codehaus/groovy/ast/InnerClassNode.java
index 1def401..8b24118 100644
--- a/src/main/java/org/codehaus/groovy/ast/InnerClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/InnerClassNode.java
@@ -74,11 +74,11 @@ public class InnerClassNode extends ClassNode {
public FieldNode getOuterField(String name) {
return outerClass.getDeclaredField(name);
}
-
+
public VariableScope getVariableScope() {
- return scope;
+ return scope;
}
-
+
public void setVariableScope(VariableScope scope) {
this.scope = scope;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/InterfaceHelperClassNode.java b/src/main/java/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
index 715e9a6..8933da3 100644
--- a/src/main/java/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
@@ -27,7 +27,7 @@ import java.util.List;
public class InterfaceHelperClassNode extends InnerClassNode {
private List callSites = new ArrayList();
-
+
/**
* @param name is the full name of the class
* @param modifiers the modifiers, @see org.objectweb.asm.Opcodes
@@ -38,11 +38,11 @@ public class InterfaceHelperClassNode extends InnerClassNode {
super(outerClass, name, modifiers, superClass, ClassHelper.EMPTY_TYPE_ARRAY, MixinNode.EMPTY_ARRAY);
setCallSites(callSites);
}
-
+
public void setCallSites(List<String> cs) {
callSites = (cs != null) ? cs : new ArrayList<String>();
}
-
+
public List<String> getCallSites() {
return callSites;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/MixinNode.java b/src/main/java/org/codehaus/groovy/ast/MixinNode.java
index 322e5e7..89e3222 100644
--- a/src/main/java/org/codehaus/groovy/ast/MixinNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/MixinNode.java
@@ -24,7 +24,7 @@ package org.codehaus.groovy.ast;
public class MixinNode extends ClassNode {
public static final MixinNode[] EMPTY_ARRAY = {};
-
+
/**
* @param name is the full name of the class
* @param modifiers the modifiers, @see org.objectweb.asm.Opcodes
diff --git a/src/main/java/org/codehaus/groovy/ast/Variable.java b/src/main/java/org/codehaus/groovy/ast/Variable.java
index eda2fd2..cf7cec2 100644
--- a/src/main/java/org/codehaus/groovy/ast/Variable.java
+++ b/src/main/java/org/codehaus/groovy/ast/Variable.java
@@ -25,33 +25,33 @@ import org.codehaus.groovy.ast.expr.Expression;
* VariableExpression, FieldNode, PropertyNode and Parameter
*/
public interface Variable {
-
+
/**
* the type of the variable
*/
ClassNode getType();
-
+
/**
* the type before wrapping primitives type of the variable
*/
ClassNode getOriginType();
-
+
/**
* the name of the variable
*/
String getName();
-
+
/**
* expression used to initialize the variable or null of there
* is no initialization.
*/
Expression getInitialExpression();
-
+
/**
* returns true if there is an initialization expression
*/
boolean hasInitialExpression();
-
+
/**
* returns true if this variable is used in a static context.
* A static context is any static initializer block, when this variable
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ArgumentListExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
index 4a9eb35..1286242 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
@@ -30,7 +30,7 @@ public class ArgumentListExpression extends TupleExpression {
public static final Object[] EMPTY_ARRAY = {
};
-
+
public static final ArgumentListExpression EMPTY_ARGUMENTS = new ArgumentListExpression();
public ArgumentListExpression() {
@@ -49,7 +49,7 @@ public class ArgumentListExpression extends TupleExpression {
addExpression(new VariableExpression(parameter));
}
}
-
+
public ArgumentListExpression(Expression expr) {
super(expr);
}
@@ -69,7 +69,7 @@ public class ArgumentListExpression extends TupleExpression {
ret.copyNodeMetaData(this);
return ret;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitArgumentlistExpression(this);
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/BooleanExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/BooleanExpression.java
index 28d9362..744b485 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/BooleanExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/BooleanExpression.java
@@ -31,7 +31,7 @@ public class BooleanExpression extends Expression {
this.expression = expression;
setType(ClassHelper.boolean_TYPE); // for consistency with AsmClassGenerator. see AsmClassGenerator.visitBooleanExpression.
}
-
+
public Expression getExpression() {
return expression;
}
@@ -48,7 +48,7 @@ public class BooleanExpression extends Expression {
ret.copyNodeMetaData(this);
return ret;
}
-
+
@Override
public String getText() {
return expression.getText();
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java
index 5d37c76..6cb3e91 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java
@@ -35,12 +35,12 @@ public class ClassExpression extends Expression {
public void visit(GroovyCodeVisitor visitor) {
visitor.visitClassExpression(this);
}
-
+
@Override
public Expression transformExpression(ExpressionTransformer transformer) {
return this;
}
-
+
@Override
public String getText() {
return getType().getName();
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ClosureListExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ClosureListExpression.java
index c017f48..5ed64df 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/ClosureListExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/ClosureListExpression.java
@@ -32,43 +32,43 @@ import java.util.List;
* </code>
* The right side is a ClosureListExpression consisting of
* two ConstantExpressions for the values 1 and 2, and two
- * EmptyStatement entries. The ClosureListExpression defines a new
+ * EmptyStatement entries. The ClosureListExpression defines a new
* variable scope. All created Closures share this scope.
*/
public class ClosureListExpression extends ListExpression {
private VariableScope scope;
-
+
public ClosureListExpression(List<Expression> expressions) {
super(expressions);
scope = new VariableScope();
}
-
+
public ClosureListExpression() {
this(new ArrayList<Expression>(3));
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitClosureListExpression(this);
}
-
+
@Override
public Expression transformExpression(ExpressionTransformer transformer) {
Expression ret = new ClosureListExpression(transformExpressions(getExpressions(), transformer));
ret.setSourcePosition(this);
ret.copyNodeMetaData(this);
- return ret;
+ return ret;
}
-
+
public void setVariableScope(VariableScope scope) {
this.scope = scope;
}
-
+
public VariableScope getVariableScope() {
return scope;
}
-
+
@Override
public String getText() {
StringBuilder buffer = new StringBuilder("(");
@@ -79,7 +79,7 @@ public class ClosureListExpression extends ListExpression {
} else {
buffer.append("; ");
}
-
+
buffer.append(expression.getText());
}
buffer.append(")");
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
index cd40f0a..3744840 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
@@ -48,7 +48,7 @@ public class ElvisOperatorExpression extends TernaryExpression {
public ElvisOperatorExpression(Expression base, Expression falseExpression) {
super(getBool(base), base, falseExpression);
}
-
+
private static BooleanExpression getBool(Expression base) {
BooleanExpression be = new BooleanExpression(base);
be.setSourcePosition(base);
@@ -59,7 +59,7 @@ public class ElvisOperatorExpression extends TernaryExpression {
public void visit(GroovyCodeVisitor visitor) {
visitor.visitShortTernaryExpression(this);
}
-
+
@Override
public Expression transformExpression(ExpressionTransformer transformer) {
Expression ret = new ElvisOperatorExpression(
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/Expression.java b/src/main/java/org/codehaus/groovy/ast/expr/Expression.java
index 2c6e0e7..8a7a91a 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/Expression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/Expression.java
@@ -32,7 +32,7 @@ import java.util.List;
public abstract class Expression extends AnnotatedNode {
public static final Expression[] EMPTY_ARRAY = new Expression[0];
private ClassNode type=ClassHelper.DYNAMIC_TYPE;
-
+
/**
* Return a copy of the expression calling the transformer on any nested expressions
* @param transformer
@@ -68,11 +68,11 @@ public abstract class Expression extends AnnotatedNode {
}
return list;
}
-
+
public ClassNode getType() {
return type;
}
-
+
public void setType(ClassNode t) {
type=t;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ExpressionTransformer.java b/src/main/java/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
index c7f6412..814ebf3 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
@@ -23,7 +23,7 @@ package org.codehaus.groovy.ast.expr;
* Provides a way to transform expressions
*/
public interface ExpressionTransformer {
-
+
/**
* Transforms the given expression into another expression
*/
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java
index 67f548a..8bba765 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java
@@ -33,7 +33,7 @@ public class GStringExpression extends Expression {
private final String verbatimText;
private final List<ConstantExpression> strings;
private final List<Expression> values;
-
+
public GStringExpression(String verbatimText) {
this.verbatimText = verbatimText;
super.setType(ClassHelper.GSTRING_TYPE);
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
index 1c52b8e..3312974 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
@@ -27,7 +27,7 @@ public class NamedArgumentListExpression extends MapExpression {
public NamedArgumentListExpression() {
}
-
+
public NamedArgumentListExpression(List<MapEntryExpression> mapEntryExpressions) {
super(mapEntryExpressions);
}
@@ -40,5 +40,5 @@ public class NamedArgumentListExpression extends MapExpression {
ret.copyNodeMetaData(this);
return ret;
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java
index 5a89909..496c81a 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java
@@ -47,7 +47,7 @@ public class PostfixExpression extends Expression {
@Override
public Expression transformExpression(ExpressionTransformer transformer) {
- Expression ret = new PostfixExpression(transformer.transform(expression), operation);
+ Expression ret = new PostfixExpression(transformer.transform(expression), operation);
ret.setSourcePosition(this);
ret.copyNodeMetaData(this);
return ret;
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java
index 481ed10..80589e3 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java
@@ -59,7 +59,7 @@ public class TernaryExpression extends Expression {
public String toString() {
return super.toString() +"[" + booleanExpression + " ? " + trueExpression + " : " + falseExpression + "]";
}
-
+
public BooleanExpression getBooleanExpression() {
return booleanExpression;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java
index 346205c..0deb294 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java
@@ -26,13 +26,13 @@ import java.util.Arrays;
import java.util.List;
/**
- * A list of statements and a scope.
+ * A list of statements and a scope.
*/
public class BlockStatement extends Statement {
private List<Statement> statements = new ArrayList<Statement>();
private VariableScope scope;
-
+
public BlockStatement() {
this(new ArrayList<Statement>(), new VariableScope());
}
@@ -50,7 +50,7 @@ public class BlockStatement extends Statement {
this.statements = statements;
this.scope = scope;
}
-
+
/**
* Creates a BlockStatement with a scope and children statements.
* @param statements
@@ -112,7 +112,7 @@ public class BlockStatement extends Statement {
public void setVariableScope(VariableScope scope) {
this.scope = scope;
}
-
+
public VariableScope getVariableScope() {
return scope;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/BreakStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/BreakStatement.java
index e7c1f7d..1863401 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/BreakStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/BreakStatement.java
@@ -26,15 +26,15 @@ import org.codehaus.groovy.ast.GroovyCodeVisitor;
public class BreakStatement extends Statement {
private String label;
-
+
public BreakStatement() {
this(null);
}
-
+
public BreakStatement(String label) {
this.label = label;
}
-
+
public String getLabel() {
return label;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java
index 13cc89f..08be679 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java
@@ -29,12 +29,12 @@ public class CaseStatement extends Statement {
private Statement code;
private Expression expression;
-
+
public CaseStatement(Expression expression, Statement code) {
this.expression = expression;
this.code = code;
}
-
+
public Statement getCode() {
return code;
}
@@ -46,7 +46,7 @@ public class CaseStatement extends Statement {
public Expression getExpression() {
return expression;
}
-
+
public void setExpression(Expression e) {
expression=e;
}
@@ -55,7 +55,7 @@ public class CaseStatement extends Statement {
public void visit(GroovyCodeVisitor visitor) {
visitor.visitCaseStatement(this);
}
-
+
@Override
public String toString() {
return super.toString() + "[expression: " + expression + "; code: " + code + "]";
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/CatchStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/CatchStatement.java
index ac5f2b4..abc88e3 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/CatchStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/CatchStatement.java
@@ -31,17 +31,17 @@ public class CatchStatement extends Statement {
private Parameter variable;
private Statement code;
-
+
public CatchStatement(Parameter variable, Statement code) {
this.variable = variable;
this.code = code;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitCatchStatement(this);
}
-
+
public Statement getCode() {
return code;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/ContinueStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/ContinueStatement.java
index 761323f..c73f770 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/ContinueStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/ContinueStatement.java
@@ -27,15 +27,15 @@ import org.codehaus.groovy.ast.GroovyCodeVisitor;
public class ContinueStatement extends Statement {
private String label;
-
+
public ContinueStatement() {
this(null);
}
-
+
public ContinueStatement(String label) {
this.label = label;
}
-
+
public String getLabel() {
return label;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/DoWhileStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
index 427a2b9..8edc60c 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
@@ -28,18 +28,18 @@ public class DoWhileStatement extends Statement implements LoopingStatement {
private BooleanExpression booleanExpression;
private Statement loopBlock;
-
+
public DoWhileStatement(BooleanExpression booleanExpression, Statement loopBlock) {
this.booleanExpression = booleanExpression;
this.loopBlock = loopBlock;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitDoWhileLoop(this);
}
-
+
public BooleanExpression getBooleanExpression() {
return booleanExpression;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/ForStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/ForStatement.java
index 887389f..6b29156 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/ForStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/ForStatement.java
@@ -35,19 +35,19 @@ public class ForStatement extends Statement implements LoopingStatement {
private Expression collectionExpression;
private Statement loopBlock;
private VariableScope scope;
-
+
public ForStatement(Parameter variable, Expression collectionExpression, Statement loopBlock) {
- this.variable = variable;
+ this.variable = variable;
this.collectionExpression = collectionExpression;
this.loopBlock = loopBlock;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitForLoop(this);
}
-
+
public Expression getCollectionExpression() {
return collectionExpression;
}
@@ -60,17 +60,17 @@ public class ForStatement extends Statement implements LoopingStatement {
public Parameter getVariable() {
return variable;
}
-
+
public ClassNode getVariableType() {
return variable.getType();
}
-
+
public void setCollectionExpression(Expression collectionExpression) {
this.collectionExpression = collectionExpression;
}
public void setVariableScope(VariableScope variableScope) {
- scope = variableScope;
+ scope = variableScope;
}
public VariableScope getVariableScope() {
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/IfStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/IfStatement.java
index 924c4ce..31bbbcd 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/IfStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/IfStatement.java
@@ -29,23 +29,23 @@ public class IfStatement extends Statement {
private BooleanExpression booleanExpression;
private Statement ifBlock;
private Statement elseBlock;
-
+
public IfStatement(BooleanExpression booleanExpression, Statement ifBlock, Statement elseBlock) {
this.booleanExpression = booleanExpression;
this.ifBlock = ifBlock;
this.elseBlock = elseBlock;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitIfElse(this);
}
-
+
public BooleanExpression getBooleanExpression() {
return booleanExpression;
}
-
+
public Statement getIfBlock() {
return ifBlock;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/LoopingStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/LoopingStatement.java
index c536aa5..569bff0 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/LoopingStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/LoopingStatement.java
@@ -20,17 +20,17 @@ package org.codehaus.groovy.ast.stmt;
/**
* This is an AST Node that provides some sort of looping mechanism. Typically
-* in the form of a block that will be executed repeatedly.
-* DoWhileStatements, WhileStatements, and ForStatements are all examples of LoopingStatements.
+* in the form of a block that will be executed repeatedly.
+* DoWhileStatements, WhileStatements, and ForStatements are all examples of LoopingStatements.
*/
public interface LoopingStatement {
/**
- * Gets the loop block.
+ * Gets the loop block.
*/
Statement getLoopBlock();
/**
- * Sets the loop block.
+ * Sets the loop block.
*/
void setLoopBlock(Statement loopBlock);
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/SwitchStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/SwitchStatement.java
index 6c1c561..d048828 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/SwitchStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/SwitchStatement.java
@@ -32,7 +32,7 @@ public class SwitchStatement extends Statement {
private Expression expression;
private List<CaseStatement> caseStatements = new ArrayList<CaseStatement>();
private Statement defaultStatement;
-
+
public SwitchStatement(Expression expression) {
this(expression, EmptyStatement.INSTANCE);
@@ -53,7 +53,7 @@ public class SwitchStatement extends Statement {
public void visit(GroovyCodeVisitor visitor) {
visitor.visitSwitch(this);
}
-
+
public List<CaseStatement> getCaseStatements() {
return caseStatements;
}
@@ -65,7 +65,7 @@ public class SwitchStatement extends Statement {
public void setExpression(Expression e) {
expression=e;
}
-
+
public Statement getDefaultStatement() {
return defaultStatement;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
index 8179649..4f51987 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
@@ -29,16 +29,16 @@ public class SynchronizedStatement extends Statement {
private Statement code;
private Expression expression;
-
+
public SynchronizedStatement(Expression expression, Statement code) {
this.expression = expression;
this.code = code;
}
-
+
public Statement getCode() {
return code;
}
-
+
public void setCode(Statement statement) {
code = statement;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/ThrowStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/ThrowStatement.java
index 3cb4975..ca9632f 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/ThrowStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/ThrowStatement.java
@@ -28,11 +28,11 @@ import org.codehaus.groovy.ast.expr.Expression;
public class ThrowStatement extends Statement {
private Expression expression;
-
+
public ThrowStatement(Expression expression) {
this.expression = expression;
}
-
+
public Expression getExpression() {
return expression;
}
diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/TryCatchStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
index 1efc095..4d7411a 100644
--- a/src/main/java/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
+++ b/src/main/java/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
@@ -36,13 +36,13 @@ public class TryCatchStatement extends Statement {
private final List<ExpressionStatement> resourceStatements = new ArrayList<>(4);
private final List<CatchStatement> catchStatements = new ArrayList<>(4);
private Statement finallyStatement;
-
+
public TryCatchStatement(Statement tryStatement, Statement finallyStatement) {
this.tryStatement = tryStatement;
this.finallyStatement = finallyStatement;
}
-
+
@Override
public void visit(GroovyCodeVisitor visitor) {
visitor.visitTryCatchFinally(this);
diff --git a/src/main/java/org/codehaus/groovy/classgen/GeneratorContext.java b/src/main/java/org/codehaus/groovy/classgen/GeneratorContext.java
index ea4f973..774b908 100644
--- a/src/main/java/org/codehaus/groovy/classgen/GeneratorContext.java
+++ b/src/main/java/org/codehaus/groovy/classgen/GeneratorContext.java
@@ -34,7 +34,7 @@ public class GeneratorContext {
private int closureClassIdx = 1;
private int syntheticMethodIdx = 0;
private final CompileUnit compileUnit;
-
+
public GeneratorContext(CompileUnit compileUnit) {
this.compileUnit = compileUnit;
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/AssertionWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/AssertionWriter.java
index b25fed6..55dafb6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/AssertionWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/AssertionWriter.java
@@ -50,7 +50,7 @@ import static org.objectweb.asm.Opcodes.POP;
public class AssertionWriter {
// assert
private static final MethodCaller assertFailedMethod = MethodCaller.newStatic(ScriptBytecodeAdapter.class, "assertFailed");
-
+
private static class AssertionTracker {
int recorderIndex;
SourceText sourceText;
@@ -59,11 +59,11 @@ public class AssertionWriter {
private final WriterController controller;
private AssertionTracker assertionTracker;
private AssertionTracker disabledTracker;
-
+
public AssertionWriter(WriterController wc) {
this.controller = wc;
}
-
+
public void writeAssertStatement(AssertStatement statement) {
MethodVisitor mv = controller.getMethodVisitor();
OperandStack operandStack = controller.getOperandStack();
@@ -93,7 +93,7 @@ public class AssertionWriter {
rewriteAssert = false;
}
}
-
+
statement.getBooleanExpression().visit(controller.getAcg());
Label exceptionThrower = operandStack.jump(IFEQ);
@@ -107,7 +107,7 @@ public class AssertionWriter {
Label afterAssert = new Label();
mv.visitJumpInsn(GOTO, afterAssert);
mv.visitLabel(exceptionThrower);
-
+
if (rewriteAssert) {
mv.visitLdcInsn(assertionTracker.sourceText.getNormalizedText());
mv.visitVarInsn(ALOAD, assertionTracker.recorderIndex);
@@ -118,13 +118,13 @@ public class AssertionWriter {
operandStack.push(ClassHelper.STRING_TYPE);
AssertionTracker savedTracker = assertionTracker;
assertionTracker = null;
-
+
// now the optional exception expression
statement.getMessageExpression().visit(controller.getAcg());
operandStack.box();
assertFailedMethod.call(mv);
- operandStack.remove(2); // assertFailed called static with 2 arguments
-
+ operandStack.remove(2); // assertFailed called static with 2 arguments
+
if (rewriteAssert) {
final Label tryEnd = new Label();
mv.visitLabel(tryEnd);
@@ -138,13 +138,13 @@ public class AssertionWriter {
// add catch any block to exception table
controller.getCompileStack().addExceptionBlock(tryStart, tryEnd, catchAny, null);
}
-
+
mv.visitLabel(afterAssert);
if (rewriteAssert) {
controller.getCompileStack().removeVar(savedTracker.recorderIndex);
}
assertionTracker = oldTracker;
- // close possibly open file handles from getting a sample for
+ // close possibly open file handles from getting a sample for
// power asserts
janitor.cleanup();
}
@@ -156,7 +156,7 @@ public class AssertionWriter {
private void writeSourcelessAssertText(AssertStatement statement) {
MethodVisitor mv = controller.getMethodVisitor();
OperandStack operandStack = controller.getOperandStack();
-
+
BooleanExpression booleanExpression = statement.getBooleanExpression();
// push expression string onto stack
String expressionText = booleanExpression.getText();
@@ -201,7 +201,7 @@ public class AssertionWriter {
controller.getCompileStack().removeVar(tempIndex);
}
}
-
+
public void record(Expression expression) {
if (assertionTracker==null) return;
record(assertionTracker.sourceText.getNormalizedColumn(expression.getLineNumber(), expression.getColumnNumber()));
@@ -211,16 +211,16 @@ public class AssertionWriter {
if (assertionTracker==null) return;
record(assertionTracker.sourceText.getNormalizedColumn(op.getStartLine(), op.getStartColumn()));
}
-
+
private void record(int normalizedColumn) {
if (assertionTracker==null) return;
-
+
MethodVisitor mv = controller.getMethodVisitor();
OperandStack operandStack = controller.getOperandStack();
-
+
operandStack.dup();
operandStack.box();
-
+
mv.visitVarInsn(ALOAD, assertionTracker.recorderIndex);
operandStack.push(ClassHelper.OBJECT_TYPE);
//helper.swapWithObject(ClassHelper.OBJECT_TYPE);
@@ -230,7 +230,7 @@ public class AssertionWriter {
mv.visitInsn(POP);
operandStack.remove(2);
}
-
+
private void addVariableNames(Expression expression, List<String> list) {
if (expression instanceof BooleanExpression) {
BooleanExpression boolExp = (BooleanExpression) expression;
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
index cae15bc..09aebe3 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
@@ -34,8 +34,8 @@ public class BinaryBooleanExpressionHelper extends BinaryIntExpressionHelper {
public BinaryBooleanExpressionHelper(WriterController wc) {
super(wc, boolArraySet, boolArrayGet);
}
-
- private static final MethodCaller
+
+ private static final MethodCaller
boolArrayGet = MethodCaller.newStatic(BytecodeInterface8.class, "zArrayGet"),
boolArraySet = MethodCaller.newStatic(BytecodeInterface8.class, "zArraySet");
@@ -43,13 +43,13 @@ public class BinaryBooleanExpressionHelper extends BinaryIntExpressionHelper {
protected ClassNode getArrayGetResultType() {
return ClassHelper.boolean_TYPE;
}
-
+
@Override
public boolean writePostOrPrefixMethod(int operation, boolean simulate) {
if (simulate) return false;
throw new GroovyBugError("should not reach here");
}
-
+
@Override
protected boolean writeStdOperators(int type, boolean simulate) {
type = type - PLUS;
@@ -57,7 +57,7 @@ public class BinaryBooleanExpressionHelper extends BinaryIntExpressionHelper {
if (simulate) return false;
throw new GroovyBugError("should not reach here");
}
-
+
@Override
protected boolean writeDivision(boolean simulate) {
if (simulate) return false;
@@ -68,22 +68,22 @@ public class BinaryBooleanExpressionHelper extends BinaryIntExpressionHelper {
protected ClassNode getNormalOpResultType() {
return ClassHelper.boolean_TYPE;
}
-
+
@Override
protected ClassNode getDevisionOpResultType() {
return ClassHelper.boolean_TYPE;
}
-
+
@Override
protected int getShiftOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected int getStandardOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected void removeTwoOperands(MethodVisitor mv) {
throw new GroovyBugError("should not reach here");
@@ -100,5 +100,5 @@ public class BinaryBooleanExpressionHelper extends BinaryIntExpressionHelper {
protected void doubleTwoOperands(MethodVisitor mv) {
throw new GroovyBugError("should not reach here");
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
index e111c45..8d6403f 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
@@ -48,7 +48,7 @@ public class BinaryDoubleExpressionHelper extends BinaryLongExpressionHelper {
if (!simulate) throw new GroovyBugError("should not reach here");
return false;
}
-
+
@Override
protected int getBitwiseOperationBytecode(int op) {
return -1;
@@ -69,7 +69,7 @@ public class BinaryDoubleExpressionHelper extends BinaryLongExpressionHelper {
if (!simulate) throw new GroovyBugError("should not reach here");
return false;
}
-
+
@Override
protected int getShiftOperationBytecode(int type) {
return -1;
@@ -83,29 +83,29 @@ public class BinaryDoubleExpressionHelper extends BinaryLongExpressionHelper {
DDIV, // INTDIV 204
DREM, // MOD 203
};
-
+
@Override
protected int getStandardOperationBytecode(int type) {
return stdOperations[type];
}
-
+
@Override
protected void writeMinusMinus(MethodVisitor mv) {
mv.visitInsn(DCONST_1);
mv.visitInsn(DSUB);
}
-
+
@Override
protected void writePlusPlus(MethodVisitor mv) {
mv.visitInsn(DCONST_1);
mv.visitInsn(DADD);
}
-
+
@Override
protected ClassNode getDevisionOpResultType() {
return ClassHelper.double_TYPE;
}
-
+
@Override
protected boolean supportsDivision() {
return true;
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
index de949a8..458d41b 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
@@ -46,7 +46,7 @@ import static org.objectweb.asm.Opcodes.IFNE;
* Base class for writing primitive typed operations
*/
public abstract class BinaryExpressionWriter {
-
+
private final WriterController controller;
private MethodCaller arraySet, arrayGet;
@@ -63,10 +63,10 @@ public abstract class BinaryExpressionWriter {
public WriterController getController() {
return controller;
}
-
+
protected static final int[] stdCompareCodes = {
IFEQ, // COMPARE_NOT_EQUAL 120
- IFNE, // COMPARE_IDENTICAL 121
+ IFNE, // COMPARE_IDENTICAL 121
IFEQ, // COMPARE_NOT_IDENTICAL 122
IFNE, // COMPARE_EQUAL 123
IFGE, // COMPARE_LESS_THAN 124
@@ -74,7 +74,7 @@ public abstract class BinaryExpressionWriter {
IFLE, // COMPARE_GREATER_THAN 126
IFLT, // COMPARE_GREATER_THAN_EQUAL 127
};
-
+
protected abstract int getCompareCode();
/**
@@ -105,19 +105,19 @@ public abstract class BinaryExpressionWriter {
}
return true;
}
-
+
protected abstract void doubleTwoOperands(MethodVisitor mv);
protected abstract void removeTwoOperands(MethodVisitor mv);
-
+
protected boolean writeSpaceship(int type, boolean simulate) {
if (type != COMPARE_TO) return false;
- /*
+ /*
we will actually do
-
+
(x < y) ? -1 : ((x == y) ? 0 : 1)
which is the essence of what the call with Number would do
this compiles to something along
-
+
<x>
<y>
LCMP
@@ -134,13 +134,13 @@ public abstract class BinaryExpressionWriter {
L3
ICONST_1
L2
-
+
since the operators are already on the stack and we don't want
to load them again, we will instead duplicate them. This will
require some pop actions in the branches!
-
+
DUP4 (operands: L1L2L1L2)
- LCMP
+ LCMP
IFGE L1 (operands: L1L2)
ICONST_M1 (operands: L1L2I)
GOTO L2
@@ -156,9 +156,9 @@ public abstract class BinaryExpressionWriter {
L2
- if jump from GOTO L2 we have LLI, but need only I
- if from L3 branch we get only I
-
+
this means we have to pop of LL before loading -1
-
+
since there is no DUP4 we have to do this:
DUP2_X1
POP2
@@ -171,7 +171,7 @@ public abstract class BinaryExpressionWriter {
MethodVisitor mv = controller.getMethodVisitor();
// duplicate arguments
doubleTwoOperands(mv);
-
+
Label l1 = new Label();
mv.visitInsn(getCompareCode());
mv.visitJumpInsn(IFGE,l1);
@@ -180,17 +180,17 @@ public abstract class BinaryExpressionWriter {
mv.visitInsn(ICONST_M1);
Label l2 = new Label();
mv.visitJumpInsn(GOTO, l2);
-
+
mv.visitLabel(l1);
Label l3 = new Label();
mv.visitInsn(getCompareCode());
mv.visitJumpInsn(IFNE,l3);
mv.visitInsn(ICONST_0);
mv.visitJumpInsn(GOTO,l2);
-
+
mv.visitLabel(l3);
mv.visitInsn(ICONST_1);
-
+
controller.getOperandStack().replace(ClassHelper.int_TYPE, 2);
}
return true;
@@ -198,11 +198,11 @@ public abstract class BinaryExpressionWriter {
protected abstract ClassNode getNormalOpResultType();
protected abstract int getStandardOperationBytecode(int type);
-
+
protected boolean writeStdOperators(int type, boolean simulate) {
type = type-PLUS;
if (type<0 || type>5 || type == 3 /*DIV*/) return false;
-
+
if (!simulate) {
int bytecode = getStandardOperationBytecode(type);
controller.getMethodVisitor().visitInsn(bytecode);
@@ -210,7 +210,7 @@ public abstract class BinaryExpressionWriter {
}
return true;
}
-
+
protected boolean writeDivision(boolean simulate) {
if (!supportsDivision()) return false;
if (!simulate) {
@@ -220,7 +220,7 @@ public abstract class BinaryExpressionWriter {
}
return true;
}
-
+
protected boolean supportsDivision() {
return false;
}
@@ -228,7 +228,7 @@ public abstract class BinaryExpressionWriter {
protected abstract ClassNode getDevisionOpResultType();
protected abstract int getBitwiseOperationBytecode(int type);
-
+
/**
* writes some the bitwise operations. type is one of BITWISE_OR,
* BITWISE_AND, BITWISE_XOR
@@ -246,9 +246,9 @@ public abstract class BinaryExpressionWriter {
}
return true;
}
-
+
protected abstract int getShiftOperationBytecode(int type);
-
+
/**
* Write shifting operations.
* Type is one of LEFT_SHIFT, RIGHT_SHIFT, or RIGHT_SHIFT_UNSIGNED
@@ -275,7 +275,7 @@ public abstract class BinaryExpressionWriter {
writeBitwiseOp(operation, simulate) ||
writeShiftOp(operation, simulate);
}
-
+
protected MethodCaller getArrayGetCaller() {
return arrayGet;
}
@@ -283,7 +283,7 @@ public abstract class BinaryExpressionWriter {
protected ClassNode getArrayGetResultType(){
return getNormalOpResultType();
}
-
+
protected MethodCaller getArraySetCaller() {
return arraySet;
}
@@ -292,10 +292,10 @@ public abstract class BinaryExpressionWriter {
this.arraySet = arraySet;
this.arrayGet = arrayGet;
}
-
+
public boolean arrayGet(int operation, boolean simulate) {
if (operation!=LEFT_SQUARE_BRACKET) return false;
-
+
if (!simulate) {
getArrayGetCaller().call(controller.getMethodVisitor());
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
index d90cceb..4e7d8b2 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
@@ -39,43 +39,43 @@ public class BinaryFloatExpressionHelper extends BinaryExpressionWriter {
public BinaryFloatExpressionHelper(WriterController controller) {
super(controller, floatArraySet, floatArrayGet);
}
-
+
@Override
protected void doubleTwoOperands(MethodVisitor mv) {
mv.visitInsn(DUP2);
}
- private static final MethodCaller
+ private static final MethodCaller
floatArrayGet = MethodCaller.newStatic(BytecodeInterface8.class, "fArrayGet"),
floatArraySet = MethodCaller.newStatic(BytecodeInterface8.class, "fArraySet");
@Override
protected boolean writeBitwiseOp(int type, boolean simulate) {
if (!simulate) throw new GroovyBugError("should not reach here");
- return false;
- }
-
+ return false;
+ }
+
@Override
protected int getBitwiseOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected int getCompareCode() {
return FCMPG;
}
-
+
@Override
protected ClassNode getNormalOpResultType() {
return ClassHelper.float_TYPE;
}
-
+
@Override
protected boolean writeShiftOp(int type, boolean simulate) {
if (!simulate) throw new GroovyBugError("should not reach here");
- return false;
- }
-
+ return false;
+ }
+
@Override
protected int getShiftOperationBytecode(int type) {
return -1;
@@ -88,24 +88,24 @@ public class BinaryFloatExpressionHelper extends BinaryExpressionWriter {
0, // DIV, (203) but we don't want that one
FDIV, // INTDIV 204
FREM, // MOD 203
- };
-
+ };
+
@Override
protected int getStandardOperationBytecode(int type) {
return stdOperations[type];
}
-
+
@Override
protected void removeTwoOperands(MethodVisitor mv) {
mv.visitInsn(POP2);
}
-
+
@Override
protected void writeMinusMinus(MethodVisitor mv) {
mv.visitInsn(FCONST_1);
mv.visitInsn(FSUB);
}
-
+
@Override
protected void writePlusPlus(MethodVisitor mv) {
mv.visitInsn(FCONST_1);
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
index 75cb14e..731dd3a 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
@@ -51,7 +51,7 @@ import static org.objectweb.asm.Opcodes.IXOR;
import static org.objectweb.asm.Opcodes.POP2;
public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
-
+
private static final MethodCaller intArrayGet = MethodCaller.newStatic(BytecodeInterface8.class, "intArrayGet");
private static final MethodCaller intArraySet = MethodCaller.newStatic(BytecodeInterface8.class, "intArraySet");
@@ -65,7 +65,7 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
IF_ICMPLE, // COMPARE_GREATER_THAN 126
IF_ICMPLT, // COMPARE_GREATER_THAN_EQUAL 127
};
-
+
private static final int[] stdOperations = {
IADD, // PLUS 200
ISUB, // MINUS 201
@@ -74,13 +74,13 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
IDIV, // INTDIV 204
IREM, // MOD 203
};
-
+
private static final int[] bitOp = {
IOR, // BITWISE_OR / PIPE 340
IAND, // BITWISE_AND 341
IXOR, // BIWISE_XOR 342
};
-
+
/* unhandled types from from org.codehaus.groovy.syntax.Types
public static final int LOGICAL_OR = 162; // ||
public static final int LOGICAL_AND = 164; // &&
@@ -88,7 +88,7 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
public static final int DIVIDE = 203; // /
public static final int STAR_STAR = 206; // **
public static final int POWER = STAR_STAR; //
-
+
public static final int PLUS_EQUAL = 210; // +=
public static final int MINUS_EQUAL = 211; // -=
public static final int MULTIPLY_EQUAL = 212; // *=
@@ -123,7 +123,7 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
public static final int BITWISE_XOR_EQUAL = 352; // ^=
public static final int BITWISE_NEGATION = REGEX_PATTERN; // ~
*/
-
+
public BinaryIntExpressionHelper(WriterController wc) {
this(wc, intArraySet, intArrayGet);
}
@@ -135,7 +135,7 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
super(wc, arraySet, arrayGet);
}
-
+
/**
* writes a std compare. This involves the tokens IF_ICMPEQ, IF_ICMPNE,
* IF_ICMPEQ, IF_ICMPNE, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE and IF_ICMPLT
@@ -165,7 +165,7 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
}
return true;
}
-
+
/**
* writes the spaceship operator, type should be COMPARE_TO
* @param type the token type
@@ -176,11 +176,11 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
if (type != COMPARE_TO) return false;
/*
we will actually do
-
+
(x < y) ? -1 : ((x == y) ? 0 : 1)
which is the essence of what the call with Integers would do
this compiles to something along
-
+
<x>
<y>
IF_ICMPGE L1
@@ -195,11 +195,11 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
L3
ICONST_1
L2
-
+
since the operators are already on the stack and we don't want
to load them again, we will instead duplicate them. This will
require some pop actions in the branches!
-
+
DUP2 (operands: IIII)
IF_ICMPGE L1 (operands: II)
ICONST_M1 (operands: III)
@@ -215,15 +215,15 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
L2
- if jump from GOTO L2 we have III, but need only I
- if from L3 branch we get only I
-
+
this means we have to pop of II before loading -1
-
+
*/
if (!simulate) {
MethodVisitor mv = getController().getMethodVisitor();
// duplicate int arguments
mv.visitInsn(DUP2);
-
+
Label l1 = new Label();
mv.visitJumpInsn(IF_ICMPGE,l1);
// no jump, so -1, need to pop off surplus II
@@ -231,13 +231,13 @@ public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
mv.visitInsn(ICONST_M1);
Label l2 = new Label();
mv.visitJumpInsn(GOTO, l2);
-
+
mv.visitLabel(l1);
Label l3 = new Label();
mv.visitJumpInsn(IF_ICMPNE,l3);
mv.visitInsn(ICONST_0);
mv.visitJumpInsn(GOTO,l2);
-
+
mv.visitLabel(l3);
mv.visitInsn(ICONST_1);
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
index bfc2499..aef72e8 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
@@ -107,7 +107,7 @@ public class BinaryLongExpressionHelper extends BinaryExpressionWriter {
LSHR, // RIGHT_SHIFT 281
LUSHR // RIGHT_SHIFT_UNSIGNED 282
};
-
+
@Override
protected int getShiftOperationBytecode(int type) {
return shiftOp[type];
@@ -121,7 +121,7 @@ public class BinaryLongExpressionHelper extends BinaryExpressionWriter {
LDIV, // INTDIV 204
LREM, // MOD 203
};
-
+
@Override
protected int getStandardOperationBytecode(int type) {
return stdOperations[type];
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
index a8d6dbb..ebe65e7 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
@@ -31,20 +31,20 @@ public class BinaryObjectExpressionHelper extends BinaryExpressionWriter {
public BinaryObjectExpressionHelper(WriterController controller) {
super(controller, arraySet, arrayGet);
}
-
+
// dummy methods
@Override
public boolean writePostOrPrefixMethod(int operation, boolean simulate) {
if (simulate) return false;
throw new GroovyBugError("should not reach here");
}
-
+
@Override
public boolean write(int operation, boolean simulate) {
if (simulate) return false;
throw new GroovyBugError("should not reach here");
}
-
+
@Override
protected boolean writeDivision(boolean simulate) {
if (simulate) return false;
@@ -55,32 +55,32 @@ public class BinaryObjectExpressionHelper extends BinaryExpressionWriter {
protected int getBitwiseOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected int getCompareCode() {
return -1;
}
-
+
@Override
protected ClassNode getNormalOpResultType() {
return null;
}
-
+
@Override
protected ClassNode getDevisionOpResultType() {
return null;
}
-
+
@Override
protected int getShiftOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected int getStandardOperationBytecode(int type) {
return -1;
}
-
+
@Override
protected void removeTwoOperands(MethodVisitor mv) {}
@Override
@@ -89,7 +89,7 @@ public class BinaryObjectExpressionHelper extends BinaryExpressionWriter {
protected void writeMinusMinus(MethodVisitor mv) {}
@Override
protected void doubleTwoOperands(MethodVisitor mv) {}
-
+
@Override
protected ClassNode getArrayGetResultType() {
return ClassHelper.OBJECT_TYPE.getPlainNodeReference();
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
index 43c5e80..0ec751a 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
@@ -26,7 +26,7 @@ import org.objectweb.asm.Label;
* Represents compile time variable metadata while compiling a method.
*/
public class BytecodeVariable {
-
+
public static final BytecodeVariable THIS_VARIABLE = new BytecodeVariable();
public static final BytecodeVariable SUPER_VARIABLE = new BytecodeVariable();
@@ -48,7 +48,7 @@ public class BytecodeVariable {
holder=false;
prevCurrent=0;
}
-
+
public BytecodeVariable(int index, ClassNode type, String name, int prevCurrent) {
this.index = index;
this.type = type;
@@ -63,7 +63,7 @@ public class BytecodeVariable {
public ClassNode getType() {
return type;
}
-
+
/**
* @return the stack index for this variable
*/
@@ -81,7 +81,7 @@ public class BytecodeVariable {
public void setHolder(boolean holder) {
this.holder = holder;
}
-
+
public Label getStartLabel() {
return startLabel;
}
@@ -111,7 +111,7 @@ public class BytecodeVariable {
public void setDynamicTyped(boolean b) {
dynamicTyped = b;
}
-
+
public boolean isDynamicTyped() {
return dynamicTyped;
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
index 1705594..6a5b797 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
@@ -115,7 +115,7 @@ public class CallSiteWriter {
callSites.addAll(ihcn.getCallSites());
}
}
-
+
public void makeSiteEntry() {
if (controller.isNotClinit()) {
MethodVisitor mv = controller.getMethodVisitor();
@@ -125,7 +125,7 @@ public class CallSiteWriter {
callSiteArrayVarIndex = controller.getCompileStack().defineTemporaryVariable("$local$callSiteArray", CALLSITE_ARRAY_TYPE, true);
}
}
-
+
public void generateCallSiteArray() {
if (!controller.getClassNode().isInterface()) {
controller.getClassVisitor().visitField(MOD_PRIVSS, CALLSITE_FIELD, REF_DESC, null, null);
@@ -164,7 +164,7 @@ public class CallSiteWriter {
mv.visitMaxs(0, 0);
mv.visitEnd();
}
-
+
private void generateCreateCallSiteArray() {
List<String> callSiteInitMethods = new LinkedList<String>();
int index = 0;
@@ -217,7 +217,7 @@ public class CallSiteWriter {
mv.visitMaxs(0,0);
mv.visitEnd();
}
-
+
private int allocateIndex(String name) {
callSites.add(name);
return callSites.size()-1;
@@ -241,11 +241,11 @@ public class CallSiteWriter {
mv.visitLdcInsn(index);
mv.visitInsn(AALOAD);
}
-
+
private void prepareSiteAndReceiver(Expression receiver, String methodName, boolean implicitThis) {
prepareSiteAndReceiver(receiver, methodName, implicitThis, false);
}
-
+
protected void prepareSiteAndReceiver(Expression receiver, String methodName, boolean implicitThis, boolean lhs) {
//site
prepareCallSite(methodName);
@@ -259,7 +259,7 @@ public class CallSiteWriter {
compileStack.popLHS();
compileStack.popImplicitThis();
}
-
+
protected void visitBoxedArgument(Expression exp) {
exp.visit(controller.getAcg());
if (!(exp instanceof TupleExpression)) {
@@ -283,17 +283,17 @@ public class CallSiteWriter {
controller.getMethodVisitor().visitMethodInsn(INVOKEINTERFACE, "org/codehaus/groovy/runtime/callsite/CallSite", safe ? "callSafe" : "call", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", true);
operandStack.replace(ClassHelper.OBJECT_TYPE, m2-m1);
}
-
+
public void makeGroovyObjectGetPropertySite(Expression receiver, String methodName, boolean safe, boolean implicitThis) {
prepareSiteAndReceiver(receiver, methodName, implicitThis);
invokeSafe(safe, "callGroovyObjectGetProperty", "callGroovyObjectGetPropertySafe");
}
-
+
public void makeGetPropertySite(Expression receiver, String methodName, boolean safe, boolean implicitThis) {
prepareSiteAndReceiver(receiver, methodName, implicitThis);
invokeSafe(safe, "callGetProperty", "callGetPropertySafe");
}
-
+
public void makeCallSite(Expression receiver, String message, Expression arguments, boolean safe, boolean implicitThis, boolean callCurrent, boolean callStatic) {
prepareSiteAndReceiver(receiver, message, implicitThis);
@@ -302,7 +302,7 @@ public class CallSiteWriter {
compileStack.pushLHS(false);
boolean constructor = message.equals(CONSTRUCTOR);
OperandStack operandStack = controller.getOperandStack();
-
+
// arguments
boolean containsSpreadExpression = AsmClassGenerator.containsSpreadExpression(arguments);
int numberOfArguments = containsSpreadExpression ? -1 : AsmClassGenerator.argumentSize(arguments);
@@ -327,9 +327,9 @@ public class CallSiteWriter {
}
controller.getCompileStack().popLHS();
controller.getCompileStack().popImplicitThis();
-
+
MethodVisitor mv = controller.getMethodVisitor();
-
+
if (numberOfArguments > 4) {
final String createArraySignature = getCreateArraySignature(numberOfArguments);
mv.visitMethodInsn(INVOKESTATIC, "org/codehaus/groovy/runtime/ArrayUtil", "createArray", createArraySignature, false);
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java b/src/main/java/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
index 9570a44..cd1a4cf 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
@@ -41,7 +41,7 @@ public class ExpressionAsVariableSlot extends BytecodeExpression {
this.controller = controller;
this.name = name;
}
-
+
public ExpressionAsVariableSlot(WriterController controller, Expression expression) {
this(controller, expression, "ExpressionAsVariableSlot_TEMP");
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java b/src/main/java/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
index 63e48ca..0057578 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
@@ -26,18 +26,18 @@ public class VariableSlotLoader extends BytecodeExpression {
private final int idx;
private final OperandStack operandStack;
-
+
public VariableSlotLoader(ClassNode type, int index, OperandStack os) {
super(type);
this.idx = index;
this.operandStack = os;
}
-
+
public VariableSlotLoader(int index, OperandStack os) {
this.idx = index;
this.operandStack = os;
}
-
+
@Override
public void visit(MethodVisitor mv) {
operandStack.load(this.getType(), idx);
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
index 4ab2ca6..e740b06 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
@@ -34,7 +34,7 @@ public class IndyCallSiteWriter extends CallSiteWriter {
super(controller);
this.controller = controller;
}
-
+
@Override
public void generateCallSiteArray() {}
@Override
@@ -49,7 +49,7 @@ public class IndyCallSiteWriter extends CallSiteWriter {
public void makeSiteEntry() {}
@Override
public void makeCallSiteArrayInitializer() {}
-
+
@Override
public void makeGetPropertySite(Expression receiver, String name, boolean safe, boolean implicitThis) {
InvokeDynamicWriter idw = (InvokeDynamicWriter)controller.getInvocationWriter();
@@ -60,5 +60,5 @@ public class IndyCallSiteWriter extends CallSiteWriter {
InvokeDynamicWriter idw = (InvokeDynamicWriter)controller.getInvocationWriter();
idw.writeGetProperty(receiver, name, safe, implicitThis, true);
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
index 5b215dc..5dd8408 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
@@ -62,8 +62,8 @@ import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
* for usage by invokedynamic.
*/
public class InvokeDynamicWriter extends InvocationWriter {
-
-
+
+
private static final String INDY_INTERFACE_NAME = IndyInterface.class.getName().replace('.', '/');
private static final String BSM_METHOD_TYPE_DESCRIPTOR =
MethodType.methodType(
@@ -101,20 +101,20 @@ public class InvokeDynamicWriter extends InvocationWriter {
}
return false;
}
-
+
private String prepareIndyCall(Expression receiver, boolean implicitThis) {
CompileStack compileStack = controller.getCompileStack();
OperandStack operandStack = controller.getOperandStack();
compileStack.pushLHS(false);
-
+
// load normal receiver as first argument
compileStack.pushImplicitThis(implicitThis);
receiver.visit(controller.getAcg());
compileStack.popImplicitThis();
return "("+getTypeDescription(operandStack.getTopOperand());
}
-
+
private void finishIndyCall(Handle bsmHandle, String methodName, String sig, int numberOfArguments, Object... bsmArgs) {
CompileStack compileStack = controller.getCompileStack();
OperandStack operandStack = controller.getOperandStack();
@@ -158,7 +158,7 @@ public class InvokeDynamicWriter extends InvocationWriter {
int flags = getMethodCallFlags(adapter, safe, containsSpreadExpression);
finishIndyCall(BSM, callSiteName, sig.toString(), numberOfArguments, methodName, flags);
}
-
+
private static int getMethodCallFlags(MethodCallerMultiAdapter adapter, boolean safe, boolean spread) {
int ret = 0;
if (safe) ret |= SAFE_NAVIGATION;
@@ -186,12 +186,12 @@ public class InvokeDynamicWriter extends InvocationWriter {
int flags = getPropertyFlags(safe,implicitThis,groovyObject);
finishIndyCall(BSM, GET.getCallSiteName(), sig, 1, propertyName, flags);
}
-
+
@Override
protected void writeNormalConstructorCall(ConstructorCallExpression call) {
makeCall(call, new ClassExpression(call.getType()), new ConstantExpression("<init>"), call.getArguments(), null, false, false, false);
}
-
+
@Override
public void coerce(ClassNode from, ClassNode target) {
ClassNode wrapper = ClassHelper.getWrapper(target);
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/package.html b/src/main/java/org/codehaus/groovy/classgen/asm/package.html
index 859c922..c2730c6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/package.html
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/package.html
@@ -24,7 +24,7 @@
<title>package org.codehaus.groovy.classgen.asm.*</title>
</head>
<body>
- <p>Helper classes for ASMClassGenerator. All classes in this package
+ <p>Helper classes for ASMClassGenerator. All classes in this package
are for internal usage only.</p>
</body>
</html>
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
index 25bd2a0..12c16c6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
@@ -111,13 +111,13 @@ public class StaticTypesWriterController extends DelegatingController {
updateStaticCompileFlag(cn);
super.setConstructorNode(cn);
}
-
+
@Override
public boolean isFastPath() {
if (isInStaticallyCheckedMethod) return true;
return super.isFastPath();
}
-
+
@Override
public CallSiteWriter getCallSiteWriter() {
MethodNode methodNode = getMethodNode();
@@ -142,7 +142,7 @@ public class StaticTypesWriterController extends DelegatingController {
return super.getStatementWriter();
}
}
-
+
@Override
public TypeChooser getTypeChooser() {
if (isInStaticallyCheckedMethod) {
diff --git a/src/main/java/org/codehaus/groovy/control/ClassNodeResolver.java b/src/main/java/org/codehaus/groovy/control/ClassNodeResolver.java
index 22ce062..5b5c38f 100644
--- a/src/main/java/org/codehaus/groovy/control/ClassNodeResolver.java
+++ b/src/main/java/org/codehaus/groovy/control/ClassNodeResolver.java
@@ -38,20 +38,20 @@ import java.util.Map;
/**
* This class is used as a pluggable way to resolve class names.
- * An instance of this class has to be added to {@link CompilationUnit} using
- * {@link CompilationUnit#setClassNodeResolver(ClassNodeResolver)}. The
- * CompilationUnit will then set the resolver on the {@link ResolveVisitor} each
+ * An instance of this class has to be added to {@link CompilationUnit} using
+ * {@link CompilationUnit#setClassNodeResolver(ClassNodeResolver)}. The
+ * CompilationUnit will then set the resolver on the {@link ResolveVisitor} each
* time new. The ResolveVisitor will prepare name lookup and then finally ask
- * the resolver if the class exists. This resolver then can return either a
+ * the resolver if the class exists. This resolver then can return either a
* SourceUnit or a ClassNode. In case of a SourceUnit the compiler is notified
* that a new source is to be added to the compilation queue. In case of a
* ClassNode no further action than the resolving is done. The lookup result
* is stored in the helper class {@link LookupResult}. This class provides a
* class cache to cache lookups. If you don't want this, you have to override
- * the methods {@link ClassNodeResolver#cacheClass(String, ClassNode)} and
+ * the methods {@link ClassNodeResolver#cacheClass(String, ClassNode)} and
* {@link ClassNodeResolver#getFromClassCache(String)}. Custom lookup logic is
- * supposed to go into the method
- * {@link ClassNodeResolver#findClassNode(String, CompilationUnit)} while the
+ * supposed to go into the method
+ * {@link ClassNodeResolver#findClassNode(String, CompilationUnit)} while the
* entry method is {@link ClassNodeResolver#resolveName(String, CompilationUnit)}
*/
public class ClassNodeResolver {
@@ -93,8 +93,8 @@ public class ClassNodeResolver {
// Map to store cached classes
private final Map<String, ClassNode> cachedClasses = new HashMap<>();
/**
- * Internal helper used to indicate a cache hit for a class that does not exist.
- * This way further lookups through a slow {@link #findClassNode(String, CompilationUnit)}
+ * Internal helper used to indicate a cache hit for a class that does not exist.
+ * This way further lookups through a slow {@link #findClassNode(String, CompilationUnit)}
* path can be avoided.
* WARNING: This class is not to be used outside of ClassNodeResolver.
*/
@@ -104,17 +104,17 @@ public class ClassNodeResolver {
throw new GroovyBugError("This is a dummy class node only! Never use it for real classes.");
}
};
-
+
/**
* Resolves the name of a class to a SourceUnit or ClassNode. If no
* class or source is found this method returns null. A lookup is done
* by first asking the cache if there is an entry for the class already available
- * to then call {@link #findClassNode(String, CompilationUnit)}. The result
+ * to then call {@link #findClassNode(String, CompilationUnit)}. The result
* of that method call will be cached if a ClassNode is found. If a SourceUnit
* is found, this method will not be asked later on again for that class, because
* ResolveVisitor will first ask the CompilationUnit for classes in the
* compilation queue and it will find the class for that SourceUnit there then.
- * method return a ClassNode instead of a SourceUnit, the res
+ * method return a ClassNode instead of a SourceUnit, the res
* @param name - the name of the class
* @param compilationUnit - the current CompilationUnit
* @return the LookupResult
@@ -132,7 +132,7 @@ public class ClassNodeResolver {
return null;
}
}
-
+
/**
* caches a ClassNode
* @param name - the name of the class
@@ -141,7 +141,7 @@ public class ClassNodeResolver {
public void cacheClass(String name, ClassNode res) {
cachedClasses.put(name, res);
}
-
+
/**
* returns whatever is stored in the class cache for the given name
* @param name - the name of the class
@@ -154,14 +154,14 @@ public class ClassNodeResolver {
ClassNode cached = cachedClasses.get(name);
return cached;
}
-
+
/**
* Extension point for custom lookup logic of finding ClassNodes. Per default
* this will use the CompilationUnit class loader to do a lookup on the class
- * path and load the needed class using that loader. Or if a script is found
- * and that script is seen as "newer", the script will be used instead of the
+ * path and load the needed class using that loader. Or if a script is found
+ * and that script is seen as "newer", the script will be used instead of the
* class.
- *
+ *
* @param name - the name of the class
* @param compilationUnit - the current compilation unit
* @return the lookup result
@@ -282,11 +282,11 @@ public class ClassNodeResolver {
if (oldClass!=null) {
lr = new LookupResult(null, oldClass);
}
-
+
if (name.startsWith("java.")) return lr;
//TODO: don't ignore inner static classes completely
if (name.indexOf('$') != -1) return lr;
-
+
// try to find a script from classpath*/
GroovyClassLoader gcl = compilationUnit.getClassLoader();
URL url = null;
diff --git a/src/main/java/org/codehaus/groovy/control/CompilePhase.java b/src/main/java/org/codehaus/groovy/control/CompilePhase.java
index edfa08e..9c45c3c 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilePhase.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilePhase.java
@@ -19,60 +19,60 @@
package org.codehaus.groovy.control;
/**
-* The phases of the GroovyCompiler. This is an enum facade on top of the
-* Phases object. In general, prefer using this object over Phases.
+* The phases of the GroovyCompiler. This is an enum facade on top of the
+* Phases object. In general, prefer using this object over Phases.
*/
public enum CompilePhase {
/**
* source files are opened and environment configured
- */
+ */
INITIALIZATION(Phases.INITIALIZATION),
-
+
/**
* the grammar is used to to produce tree of tokens representing the source code
- */
+ */
PARSING(Phases.PARSING),
-
+
/**
* An abstract syntax tree (AST) is created from token trees
- */
+ */
CONVERSION(Phases.CONVERSION),
-
+
/**
* Performs consistency and validity checks that the grammar can't check for, and resolves classes
- */
+ */
SEMANTIC_ANALYSIS(Phases.SEMANTIC_ANALYSIS),
-
+
/**
* Complete building the AST
- */
+ */
CANONICALIZATION(Phases.CANONICALIZATION),
-
+
/**
* instruction set is chosen, for example java5 or pre java5
- */
+ */
INSTRUCTION_SELECTION(Phases.INSTRUCTION_SELECTION),
-
+
/**
* creates the binary output in memory
- */
+ */
CLASS_GENERATION(Phases.CLASS_GENERATION),
-
+
/**
* write the binary output to the file system
- */
+ */
OUTPUT(Phases.OUTPUT),
-
+
/**
* Perform any last cleanup
- */
+ */
FINALIZATION(Phases.FINALIZATION),
;
/**
- * The phases as an array, with a null entry.
- */
+ * The phases as an array, with a null entry.
+ */
public static CompilePhase[] phases = {
null,
INITIALIZATION,
@@ -92,8 +92,8 @@ public enum CompilePhase {
}
/**
- * Returns the underlieng integer Phase number.
- */
+ * Returns the underlieng integer Phase number.
+ */
public int getPhaseNumber() {
return phaseNumber;
}
diff --git a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
index 9ae704a..d700812 100644
--- a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
+++ b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
@@ -31,7 +31,7 @@ public class MultipleCompilationErrorsException extends
private static final long serialVersionUID = 8583586586290252555L;
protected ErrorCollector collector;
-
+
public MultipleCompilationErrorsException(ErrorCollector ec) {
super(0, null);
if (ec == null) {
@@ -47,7 +47,7 @@ public class MultipleCompilationErrorsException extends
public ErrorCollector getErrorCollector() {
return collector;
}
-
+
@Override
public String getMessage() {
Writer data = new StringBuilderWriter();
diff --git a/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java b/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
index a4bd1af..44caa25 100644
--- a/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
+++ b/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
@@ -53,12 +53,12 @@ public class FileReaderSource extends AbstractReaderSource {
}
/**
- * Returns a new Reader on the underlying source object.
+ * Returns a new Reader on the underlying source object.
*/
@Override
public Reader getReader() throws IOException {
// we want to remove the BOM windows adds from a file if the encoding is UTF-8
- // in other cases we depend on the charsets
+ // in other cases we depend on the charsets
Charset cs = Charset.forName(configuration.getSourceEncoding());
InputStream in = new BufferedInputStream(new FileInputStream(file));
if (UTF8.name().equalsIgnoreCase(cs.name())) {
diff --git a/src/main/java/org/codehaus/groovy/control/io/NullWriter.java b/src/main/java/org/codehaus/groovy/control/io/NullWriter.java
index 7bcda2f..0efc9f4 100644
--- a/src/main/java/org/codehaus/groovy/control/io/NullWriter.java
+++ b/src/main/java/org/codehaus/groovy/control/io/NullWriter.java
@@ -25,13 +25,13 @@ import java.io.Writer;
*/
public class NullWriter extends Writer {
public static final NullWriter DEFAULT = new NullWriter();
-
+
@Override
public void close() {}
-
+
@Override
public void flush() {}
-
+
@Override
public void write(char[] cbuf, int off, int len ) {}
}
diff --git a/src/main/java/org/codehaus/groovy/control/io/ReaderSource.java b/src/main/java/org/codehaus/groovy/control/io/ReaderSource.java
index 1faa228..95a1d1b 100644
--- a/src/main/java/org/codehaus/groovy/control/io/ReaderSource.java
+++ b/src/main/java/org/codehaus/groovy/control/io/ReaderSource.java
@@ -37,14 +37,14 @@ public interface ReaderSource extends HasCleanup {
* @return the reader to the resource
*/
Reader getReader() throws IOException;
-
+
/**
* Returns true if the source can be restarted (ie. if getReader()
* will return non-null on subsequent calls.
* @return true if the resource can be reopened for reading
*/
boolean canReopenSource();
-
+
/**
* Returns a line from the source, or null, if unavailable. If
* you supply a Janitor, resources will be cached.
@@ -53,7 +53,7 @@ public interface ReaderSource extends HasCleanup {
* @return the line of interest
*/
String getLine( int lineNumber, Janitor janitor );
-
+
/**
* Cleans up any cached resources used by getLine().
*/
diff --git a/src/main/java/org/codehaus/groovy/control/io/StringReaderSource.java b/src/main/java/org/codehaus/groovy/control/io/StringReaderSource.java
index ba03a6f..f8fefc6 100644
--- a/src/main/java/org/codehaus/groovy/control/io/StringReaderSource.java
+++ b/src/main/java/org/codehaus/groovy/control/io/StringReaderSource.java
@@ -42,9 +42,9 @@ public class StringReaderSource extends AbstractReaderSource {
super( configuration );
this.string = string;
}
-
+
/**
- * Returns a new Reader on the underlying source object.
+ * Returns a new Reader on the underlying source object.
*/
@Override
public Reader getReader() throws IOException {
diff --git a/src/main/java/org/codehaus/groovy/control/io/URLReaderSource.java b/src/main/java/org/codehaus/groovy/control/io/URLReaderSource.java
index 45b3deb..e283cec 100644
--- a/src/main/java/org/codehaus/groovy/control/io/URLReaderSource.java
+++ b/src/main/java/org/codehaus/groovy/control/io/URLReaderSource.java
@@ -34,7 +34,7 @@ import java.net.URL;
*/
public class URLReaderSource extends AbstractReaderSource {
private final URL url; // The URL from which we produce Readers.
-
+
/**
* Creates the ReaderSource from a File descriptor.
* @param url url pointing to script source
@@ -46,7 +46,7 @@ public class URLReaderSource extends AbstractReaderSource {
}
/**
- * Returns a new Reader on the underlying source object.
+ * Returns a new Reader on the underlying source object.
*/
@Override
public Reader getReader() throws IOException {
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedConstructor.java b/src/main/java/org/codehaus/groovy/reflection/CachedConstructor.java
index 1ed384f..0a4dd85 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedConstructor.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedConstructor.java
@@ -104,7 +104,7 @@ public class CachedConstructor extends ParameterTypes {
public int getModifiers () {
return cachedConstructor.getModifiers();
}
-
+
public CachedClass getCachedClass() {
return clazz;
}
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
index fbe052c..f8aae2d 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java
@@ -255,7 +255,7 @@ public class CachedMethod extends MetaMethod implements Comparable {
public String toString() {
return cachedMethod.toString();
}
-
+
private static Constructor getConstructor(SoftReference<Constructor> ref) {
if (ref==null) return null;
return ref.get();
@@ -274,7 +274,7 @@ public class CachedMethod extends MetaMethod implements Comparable {
skipCompiled = true;
}
}
-
+
if (constr!=null) {
try {
return (CallSite) constr.newInstance(site, metaClass, this, params, constr);
@@ -303,7 +303,7 @@ public class CachedMethod extends MetaMethod implements Comparable {
skipCompiled = true;
}
}
-
+
if (constr!=null) {
try {
return (CallSite) constr.newInstance(site, metaClass, this, params, constr);
@@ -331,7 +331,7 @@ public class CachedMethod extends MetaMethod implements Comparable {
skipCompiled = true;
}
}
-
+
if (constr!=null) {
try {
return (CallSite) constr.newInstance(site, metaClass, this, params, constr);
diff --git a/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java b/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
index 2b33315..36795f2 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ReflectionCache.java
@@ -37,7 +37,7 @@ public class ReflectionCache {
}
return (String) mopNameEntry.value;
}
-
+
static final CachedClass STRING_CLASS = getCachedClass(String.class);
public static boolean isArray(Class klazz) {
@@ -93,7 +93,7 @@ public class ReflectionCache {
public static CachedClass getCachedClass(Class klazz) {
if (klazz == null)
return null;
-
+
return ClassInfo.getClassInfo(klazz).getCachedClass();
}
diff --git a/src/main/java/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java b/src/main/java/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
index ba22134..fb1dcbf 100644
--- a/src/main/java/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
@@ -32,7 +32,7 @@ public class BooleanCachedClass extends CachedClass {
public boolean isDirectlyAssignable(Object argument) {
return (allowNull && argument == null) || argument instanceof Boolean;
}
-
+
@Override
public boolean isAssignableFrom(Class classToTransformFrom) {
return (allowNull && classToTransformFrom == null)
diff --git a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
index 227eba4..5ab7ac7 100644
--- a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
@@ -89,7 +89,7 @@ public class CachedSAMClass extends CachedClass {
instantiateAggregateFromBaseClass(m, clazz);
}
}
-
+
@Override
public Object coerceArgument(Object argument) {
if (argument instanceof Closure) {
@@ -140,7 +140,7 @@ public class CachedSAMClass extends CachedClass {
if (current.size()==1) return current.get(0);
Method m = current.remove(0);
for (Method m2 : current) {
- if (m.getName().equals(m2.getName()) &&
+ if (m.getName().equals(m2.getName()) &&
Arrays.equals(m.getParameterTypes(), m2.getParameterTypes()))
{
continue;
diff --git a/src/main/java/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java b/src/main/java/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
index 5699cd9..f1b75ce 100644
--- a/src/main/java/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
@@ -28,7 +28,6 @@ public class LongCachedClass extends NumberCachedClass {
this.allowNull = allowNull;
}
-
@Override
public Object coerceArgument(Object argument) {
if (argument instanceof Long) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java b/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
index d0697de..72bcd83 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ArrayUtil.java
@@ -24,7 +24,7 @@ package org.codehaus.groovy.runtime;
* <p>
* The purpose is the reduction of the size of the bytecode. Consider creating a three element Object[] with null values:
* <pre>
-* ANEWARRAY java/lang/Object
+* ANEWARRAY java/lang/Object
* DUP
* ICONST_0
* ACONST_NULL
@@ -50,8 +50,8 @@ package org.codehaus.groovy.runtime;
* inlining threshold here or there.
* <p>
* So even though the class is ugly, there are good reason to have this in Groovy, even if the class makes
-* absolutely no sense in normal Java. But it is not used in normal Java, but from the bytecode.
-*/
+* absolutely no sense in normal Java. But it is not used in normal Java, but from the bytecode.
+*/
public class ArrayUtil {
private static final Object[] EMPTY = new Object[0];
diff --git a/src/main/java/org/codehaus/groovy/runtime/BytecodeInterface8.java b/src/main/java/org/codehaus/groovy/runtime/BytecodeInterface8.java
index 71cabf3..64f5614 100644
--- a/src/main/java/org/codehaus/groovy/runtime/BytecodeInterface8.java
+++ b/src/main/java/org/codehaus/groovy/runtime/BytecodeInterface8.java
@@ -24,13 +24,13 @@ import org.codehaus.groovy.runtime.metaclass.DefaultMetaClassInfo;
* This class contains methods special to optimizations used directly from bytecode in Groovy 1.8
*/
public class BytecodeInterface8 {
-
+
public static boolean disabledStandardMetaClass() {
return DefaultMetaClassInfo.disabledStandardMetaClass();
}
-
+
// ------------------ int ------------------
-
+
/**
* @return true if integer has its default MetaClass
*/
@@ -39,15 +39,15 @@ public class BytecodeInterface8 {
}
// ------------------ int[] ------------------
-
+
/**
* @return true if integer array has its default MetaClass
*/
public static boolean isOrigIntArray(){
return DefaultMetaClassInfo.isOrigIntArray();
}
-
-
+
+
/**
* get value from int[] using normalized index
*/
@@ -58,7 +58,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from int[] using normalized index
*/
@@ -69,9 +69,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ byte ------------------
-
+
/**
* @return true if byte has its default MetaClass
*/
@@ -80,15 +80,15 @@ public class BytecodeInterface8 {
}
// ------------------ byte[] ------------------
-
+
/**
* @return true if byte array has its default MetaClass
*/
public static boolean isOrigBArray(){
return false;
}
-
-
+
+
/**
* get value from byte[] using normalized index
*/
@@ -99,7 +99,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from byte[] using normalized index
*/
@@ -110,9 +110,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ short ------------------
-
+
/**
* @return true if short has its default MetaClass
*/
@@ -121,15 +121,15 @@ public class BytecodeInterface8 {
}
// ------------------ short[] ------------------
-
+
/**
* @return true if short array has its default MetaClass
*/
public static boolean isOrigSArray(){
return false;
}
-
-
+
+
/**
* get value from short[] using normalized index
*/
@@ -140,7 +140,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from short[] using normalized index
*/
@@ -151,9 +151,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ char ------------------
-
+
/**
* @return true if char has its default MetaClass
*/
@@ -162,15 +162,15 @@ public class BytecodeInterface8 {
}
// ------------------ char[] ------------------
-
+
/**
* @return true if char array has its default MetaClass
*/
public static boolean isOrigCArray(){
return false;
}
-
-
+
+
/**
* get value from char[] using normalized index
*/
@@ -181,7 +181,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from char[] using normalized index
*/
@@ -192,9 +192,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ long ------------------
-
+
/**
* @return true if long has its default MetaClass
*/
@@ -203,15 +203,15 @@ public class BytecodeInterface8 {
}
// ------------------ long[] ------------------
-
+
/**
* @return true if long array has its default MetaClass
*/
public static boolean isOrigLArray(){
return false;
}
-
-
+
+
/**
* get value from long[] using normalized index
*/
@@ -222,7 +222,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from long[] using normalized index
*/
@@ -233,9 +233,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ boolean ------------------
-
+
/**
* @return true if boolean has its default MetaClass
*/
@@ -244,14 +244,14 @@ public class BytecodeInterface8 {
}
// ------------------ boolean[] ------------------
-
+
/**
* @return true if boolean array has its default MetaClass
*/
public static boolean isOrigZArray(){
return false;
}
-
+
/**
* get value from boolean[] using normalized index
*/
@@ -262,7 +262,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from boolean[] using normalized index
*/
@@ -273,9 +273,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ float ------------------
-
+
/**
* @return true if float has its default MetaClass
*/
@@ -284,14 +284,14 @@ public class BytecodeInterface8 {
}
// ------------------ float[] ------------------
-
+
/**
* @return true if float array has its default MetaClass
*/
public static boolean isOrigFArray(){
return false;
}
-
+
/**
* get value from float[] using normalized index
*/
@@ -302,7 +302,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from float[] using normalized index
*/
@@ -313,9 +313,9 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ double ------------------
-
+
/**
* @return true if double has its default MetaClass
*/
@@ -324,14 +324,14 @@ public class BytecodeInterface8 {
}
// ------------------ double[] ------------------
-
+
/**
* @return true if double array has its default MetaClass
*/
public static boolean isOrigDArray(){
return false;
}
-
+
/**
* get value from double[] using normalized index
*/
@@ -342,7 +342,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from double[] using normalized index
*/
@@ -353,7 +353,7 @@ public class BytecodeInterface8 {
a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)]=v;
}
}
-
+
// ------------------ Object[] ------------------
public static Object objectArrayGet(Object[] a, int i) {
try {
@@ -362,7 +362,7 @@ public class BytecodeInterface8 {
return a[DefaultGroovyMethodsSupport.normaliseIndex(i,a.length)];
}
}
-
+
/**
* set value from double[] using normalized index
*/
diff --git a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
index f21b143..ee118e6 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ConvertedClosure.java
@@ -38,7 +38,7 @@ public class ConvertedClosure extends ConversionHandler implements Serializable
super(closure);
this.methodName = method;
}
-
+
public ConvertedClosure(Closure closure) {
this(closure,null);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java b/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
index 5223409..6b483ca 100644
--- a/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
@@ -33,7 +33,7 @@ public class IteratorClosureAdapter<T> extends Closure {
private static final long serialVersionUID = -7485077849389539770L;
private final List<T> list = new ArrayList<T>();
private MetaClass metaClass = InvokerHelper.getMetaClass(getClass());
-
+
public IteratorClosureAdapter(Object delegate) {
super(delegate);
}
@@ -47,7 +47,7 @@ public class IteratorClosureAdapter<T> extends Closure {
public void setMetaClass(MetaClass metaClass) {
this.metaClass = metaClass;
}
-
+
public List<T> asList() {
return list;
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
index 4a9d6d1..1dc93b5 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java
@@ -33,7 +33,7 @@ public abstract class MethodKey {
private final String name;
private final Class sender;
private final boolean isCallToSuper;
-
+
public MethodKey(Class sender, String name, boolean isCallToSuper) {
this.sender = sender;
this.name = name;
@@ -69,7 +69,7 @@ public abstract class MethodKey {
if (isCallToSuper!=that.isCallToSuper) return false;
if (!name.equals(that.name)) return false;
if ((size = getParameterCount()) != that.getParameterCount()) return false;
-
+
for (int i = 0; i < size; i++) {
if (getParameterType(i) != that.getParameterType(i)) {
return false;
diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
index 1c6c5aa..5f7b92c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
@@ -44,7 +44,7 @@ public class MethodRankHelper{
public static final int DL_DELETE = 10; //This is also the cost for a insert
public static final int DL_TRANSPOSITION = 5;
public static final int DL_CASE = 5;
-
+
public static final int MAX_RECOMENDATIONS = 5;
public static final int MAX_METHOD_SCORE = 50;
public static final int MAX_CONSTRUCTOR_SCORE = 20;
@@ -59,7 +59,7 @@ public class MethodRankHelper{
this.v = v;
}
}
-
+
/**
* Returns a string detailing possible solutions to a missing method
* if no good solutions can be found a empty string is returned.
@@ -107,7 +107,7 @@ public class MethodRankHelper{
}
return sb.toString();
}
-
+
private static List<Pair<Class,Class>> getConflictClasses(List<MetaMethod> sugg, Class[] argumentClasses) {
List<Pair<Class,Class>> ret = new LinkedList<Pair<Class,Class>>();
Set<Class> recordedClasses = new HashSet<Class>();
@@ -162,7 +162,7 @@ public class MethodRankHelper{
return "";
}
}
-
+
/**
* Returns a string detailing possible solutions to a missing field or property
* if no good solutions can be found a empty string is returned.
@@ -177,7 +177,7 @@ public class MethodRankHelper{
List<RankableField> rf = new ArrayList<RankableField>(fi.size());
StringBuilder sb = new StringBuilder();
sb.append("\nPossible solutions: ");
-
+
for(MetaProperty mp : fi) rf.add(new RankableField(fieldName, mp));
Collections.sort(rf);
@@ -191,7 +191,7 @@ public class MethodRankHelper{
}
return i > 0? sb.toString(): "";
}
-
+
/**
* creates a comma separated list of each of the class names.
*
@@ -206,8 +206,8 @@ public class MethodRankHelper{
}
return sb.toString();
}
-
-
+
+
private static String listParameterNames(CachedClass[] cachedClasses){
StringBuilder sb = new StringBuilder();
for(int i =0; i < cachedClasses.length;i++){
@@ -216,7 +216,7 @@ public class MethodRankHelper{
}
return sb.toString();
}
-
+
/**
* Returns a sorted(ranked) list of a selection of the methods among candidates which
* most closely resembles original.
@@ -230,7 +230,7 @@ public class MethodRankHelper{
List<RankableMethod> rm = new ArrayList<RankableMethod>(methods.size());
if (original==null) original = EMPTY_OBJECT_ARRAY;
Class[] ta = new Class[original.length];
-
+
Class nullC = NullObject.class;
for(int i = 0; i < original.length; i++){
//All nulls have to be wrapped so that they can be compared
@@ -241,7 +241,7 @@ public class MethodRankHelper{
rm.add(new RankableMethod(name, ta, m));
}
Collections.sort(rm);
-
+
List<MetaMethod> l = new ArrayList<MetaMethod>(rm.size());
for (RankableMethod m : rm) {
if (l.size() > MAX_RECOMENDATIONS) break;
@@ -339,7 +339,7 @@ public class MethodRankHelper{
return score.compareTo(co.score);
}
}
-
+
/**
* This class wraps a method object and a score variable so methods
* Can easily be ranked by their likeness to a another method
@@ -360,7 +360,7 @@ public class MethodRankHelper{
return score.compareTo(co.score);
}
}
-
+
/**
* If c is a primitive class this method returns a boxed version
* otherwise c is returned.
@@ -389,7 +389,7 @@ public class MethodRankHelper{
return c;
}
}
-
+
/**
* This is a small wrapper for nulls
*/
@@ -494,7 +494,7 @@ public class MethodRankHelper{
private static boolean caselessCompare(char a, char b){
return Character.toLowerCase(a) == Character.toLowerCase(b);
}
-
+
/**
* This is a implementation of DL distance between two Object arrays instead
* of character streams. The objects are compared using their equals method.
diff --git a/src/main/java/org/codehaus/groovy/runtime/NullObject.java b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
index d4d42f6..c4703e2 100644
--- a/src/main/java/org/codehaus/groovy/runtime/NullObject.java
+++ b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
@@ -130,7 +130,7 @@ public class NullObject extends GroovyObjectSupport {
/**
* Fallback for null+null.
- * The result is always a NPE. The plus(String) version will catch
+ * The result is always a NPE. The plus(String) version will catch
* the case of adding a non null String to null.
*
* @param o - the Object
@@ -164,7 +164,7 @@ public class NullObject extends GroovyObjectSupport {
/**
* A null object always coerces to false.
- *
+ *
* @return false
*/
public boolean asBoolean() {
diff --git a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
index 6304b86..c9066f1 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
@@ -29,7 +29,7 @@ public class StreamGroovyMethods {
/**
* Returns a lazily concatenated stream whose elements are all the elements of this stream followed by all the elements of the {@link Collection} object.
- *
+ *
* <pre class="groovyTestCase">
* import java.util.stream.Stream
* assert (Stream.of(1) + [2]).toList() == [1,2]
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
index 68abc48..9ad34bb 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
@@ -38,7 +38,7 @@ public class BooleanClosureWrapper {
private final BooleanReturningMethodInvoker bmi;
private final Closure wrapped;
private final int numberOfArguments;
-
+
public BooleanClosureWrapper(Closure wrapped) {
this.wrapped = wrapped;
this.bmi = new BooleanReturningMethodInvoker("call");
@@ -51,7 +51,7 @@ public class BooleanClosureWrapper {
public boolean call(Object... args) {
return bmi.invoke(wrapped, args);
}
-
+
/**
* Bridge for a call based on a map entry. If the call is done on a {@link Closure}
* taking one argument, then we give in the {@link Entry}, otherwise we will
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
index 9a36700..171d305 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
@@ -34,15 +34,15 @@ import org.apache.groovy.internal.util.UncheckedThrow;
*/
public class BooleanReturningMethodInvoker {
private final CallSiteArray csa;
-
+
public BooleanReturningMethodInvoker() {
this(null);
}
-
+
public BooleanReturningMethodInvoker(String methodName) {
csa = new CallSiteArray(BooleanReturningMethodInvoker.class, new String[]{methodName, "asBoolean"});
}
-
+
public boolean invoke(Object receiver, Object... args) {
try {
// make cached call for given method
@@ -54,7 +54,7 @@ public class BooleanReturningMethodInvoker {
return false;
}
}
-
+
public boolean convertToBoolean(Object arg) {
// handle conversion to boolean
if (arg == null) return false;
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
index 42d1288..dbe1f74 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
@@ -135,7 +135,7 @@ public class ConstructorSite extends MetaClassSite {
return CallSiteArray.defaultCallConstructor(this, receiver, args);
}
}
-
+
public static class NoParamSiteInnerClass extends ConstructorSiteNoUnwrapNoCoerce {
public NoParamSiteInnerClass(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) {
super(site, metaClass, constructor, params);
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java
index c8fa582..4c5bde5 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java
@@ -40,7 +40,7 @@ public final class NullCallSite extends AbstractCallSite {
return CallSiteArray.defaultCall(this, receiver, args);
}
}
-
+
@Override
public Object getProperty(Object receiver) throws Throwable {
if (receiver == null) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
index 62d7aef..6e54576 100644
--- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
+++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
@@ -45,7 +45,6 @@ public final class NumberNumberMinus extends NumberNumberMetaMethod {
return NumberMath.subtract(left, right);
}
-
@Override
public CallSite createIntegerInteger(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params, Object receiver, Object[] args) {
return new IntegerInteger(site, metaClass, metaMethod, params, receiver, args);
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java b/src/main/java/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
index f80676c..2f9d9c6 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
@@ -65,7 +65,7 @@ final class LRUProtectionStorage extends LinkedHashMap<Object, Object> implement
if (value != null) put(key, value);
return value;
}
-
+
/**
* Performs a shallow clone
*
diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/Memoize.java b/src/main/java/org/codehaus/groovy/runtime/memoize/Memoize.java
index 21608df..992229e 100644
--- a/src/main/java/org/codehaus/groovy/runtime/memoize/Memoize.java
+++ b/src/main/java/org/codehaus/groovy/runtime/memoize/Memoize.java
@@ -117,7 +117,7 @@ public abstract class Memoize {
private static final long serialVersionUID = -2780003153676993093L;
final MemoizeCache<Object, Object> cache;
final Closure<V> closure;
-
+
MemoizeFunction(final MemoizeCache<Object, ?> cache, Closure<V> closure) {
super(closure.getOwner());
this.cache = coerce(cache);
@@ -129,7 +129,7 @@ public abstract class Memoize {
private static MemoizeCache coerce(MemoizeCache<Object, ?> cache) {
return cache;
}
-
+
@Override
public V call(final Object... args) {
final Object key = generateKey(args);
@@ -146,12 +146,12 @@ public abstract class Memoize {
return call(args);
}
}
-
+
private static class SoftReferenceMemoizeFunction<V> extends MemoizeFunction<V> {
private static final long serialVersionUID = -1338206227167457991L;
final ProtectionStorage lruProtectionStorage;
final ReferenceQueue queue;
-
+
SoftReferenceMemoizeFunction(final MemoizeCache<Object, SoftReference<Object>> cache, Closure<V> closure,
ProtectionStorage lruProtectionStorage, ReferenceQueue queue) {
super(cache, closure);
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
index c2308f7..1616519 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
@@ -54,7 +54,7 @@ public class ClosureStaticMetaMethod extends MetaMethod implements ClosureInvoki
this.declaringClass = ReflectionCache.getCachedClass(declaringClass);
this.name = name;
}
-
+
@Override
public Object invoke(Object object, Object[] arguments) {
Closure cloned = (Closure) callable.clone();
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
index 3d280bf..a4d2f70 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
@@ -216,14 +216,14 @@ public class ConcurrentReaderHashMap
* MUST be a power of two.
*/
private static final int MINIMUM_CAPACITY = 4;
-
+
/**
* The maximum capacity, used if a higher value is implicitly specified
* by either of the constructors with arguments.
* MUST be a power of two <= 1<<30.
*/
private static final int MAXIMUM_CAPACITY = 1 << 30;
-
+
/**
* The default load factor for this table (1.0).
* Used when not otherwise specified in constructor.
@@ -263,7 +263,7 @@ public class ConcurrentReaderHashMap
*/
private static int p2capacity(int initialCapacity) {
int cap = initialCapacity;
-
+
// Compute the appropriate capacity
int result;
if (cap > MAXIMUM_CAPACITY || cap < 0) {
@@ -370,7 +370,7 @@ public class ConcurrentReaderHashMap
public synchronized boolean isEmpty() {
return count == 0;
}
-
+
/**
@@ -477,7 +477,7 @@ public class ConcurrentReaderHashMap
public Object put(Object key, Object value) {
if (value == null)
throw new NullPointerException();
-
+
int hash = hash(key);
Entry[] tab = table;
int index = hash & (tab.length-1);
@@ -509,7 +509,7 @@ public class ConcurrentReaderHashMap
}
}
}
-
+
// retry if wrong list or lost race against concurrent remove
return sput(key, value, hash);
}
@@ -637,14 +637,14 @@ public class ConcurrentReaderHashMap
on this strategy to ensure that elements will not be
repeated during iteration.
*/
-
+
int hash = hash(key);
Entry[] tab = table;
int index = hash & (tab.length-1);
Entry first = tab[index];
Entry e = first;
-
+
for (e = first; e != null; e = e.next)
if (e.hash == hash && eq(key, e.key))
break;
@@ -661,18 +661,18 @@ public class ConcurrentReaderHashMap
if (first == tab[index] && oldValue != null) {
e.value = null;
count--;
-
+
Entry head = e.next;
for (Entry p = first; p != e; p = p.next)
head = new Entry(p.hash, p.key, p.value, head);
-
+
tab[index] = head;
recordModification(head);
return oldValue;
}
}
}
-
+
// Wrong list or interference
return sremove(key, hash);
}
@@ -686,7 +686,7 @@ public class ConcurrentReaderHashMap
Entry[] tab = table;
int index = hash & (tab.length-1);
Entry first = tab[index];
-
+
for (Entry e = first; e != null; e = e.next) {
if (e.hash == hash && eq(key, e.key)) {
Object oldValue = e.value;
@@ -695,7 +695,7 @@ public class ConcurrentReaderHashMap
Entry head = e.next;
for (Entry p = first; p != e; p = p.next)
head = new Entry(p.hash, p.key, p.value, head);
-
+
tab[index] = head;
recordModification(head);
return oldValue;
@@ -859,7 +859,7 @@ public class ConcurrentReaderHashMap
Set ks = keySet;
return (ks != null)? ks : (keySet = new KeySet());
}
-
+
private class KeySet extends AbstractSet {
@Override
public Iterator iterator() {
@@ -909,7 +909,7 @@ public class ConcurrentReaderHashMap
Collection vs = values;
return (vs != null)? vs : (values = new Values());
}
-
+
private class Values extends AbstractCollection {
@Override
public Iterator iterator() {
@@ -1122,12 +1122,12 @@ public class ConcurrentReaderHashMap
Map.Entry e = (Map.Entry)o;
return (key.equals(e.getKey()) && value.equals(e.getValue()));
}
-
+
@Override
public int hashCode() {
return key.hashCode() ^ value.hashCode();
}
-
+
@Override
public String toString() {
return key + "=" + value;
@@ -1216,12 +1216,12 @@ public class ConcurrentReaderHashMap
@Override
protected Object returnValueOfNext() { return currentKey; }
}
-
+
protected class ValueIterator extends HashIterator {
@Override
protected Object returnValueOfNext() { return currentValue; }
}
-
+
/**
@@ -1242,17 +1242,17 @@ public class ConcurrentReaderHashMap
throws IOException {
// Write out the threshold, loadfactor, and any hidden stuff
s.defaultWriteObject();
-
+
// Write out number of buckets
s.writeInt(table.length);
-
+
// Write out size (number of Mappings)
s.writeInt(count);
-
+
// Write out keys and values (alternating)
for (int index = table.length-1; index >= 0; index--) {
Entry entry = table[index];
-
+
while (entry != null) {
s.writeObject(entry.key);
s.writeObject(entry.value);
@@ -1276,10 +1276,10 @@ public class ConcurrentReaderHashMap
// Read in number of buckets and allocate the bucket array;
int numBuckets = s.readInt();
table = new Entry[numBuckets];
-
+
// Read in size (number of Mappings)
int size = s.readInt();
-
+
// Read the keys and values, and put the mappings in the table
for (int i=0; i<size; i++) {
Object key = s.readObject();
@@ -1287,7 +1287,7 @@ public class ConcurrentReaderHashMap
put(key, value);
}
}
-
+
/**
* @return the number of slots in this table
**/
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
index d3d45d2..12a01be 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
@@ -24,16 +24,16 @@ package org.codehaus.groovy.runtime.metaclass;
* used for certain primitives.
*/
public class DefaultMetaClassInfo {
-
+
//---------------------------------------------
// boolean
//---------------------------------------------
-
+
// if original boolean meta class
private static boolean origBoolean = true;
// if origBoolean and withoutCustomHandle
private static boolean origBooleanRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original boolean meta class is used.
@@ -41,7 +41,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigBool() {
return origBooleanRes;
}
-
+
/**
* sets if the original boolean meta class is used
*/
@@ -49,16 +49,16 @@ public class DefaultMetaClassInfo {
origBoolean = v;
origBooleanRes = withoutCustomHandle && origBoolean;
}
-
+
//---------------------------------------------
// byte
//---------------------------------------------
-
+
// if original Byte meta class
private static boolean origByte = true;
// if origByte and withoutCustomHandle
private static boolean origByteRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original byte meta class is used.
@@ -66,7 +66,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigByte() {
return origByteRes;
}
-
+
/**
* sets if the original byte meta class is used
*/
@@ -74,16 +74,16 @@ public class DefaultMetaClassInfo {
origByte = v;
origByteRes = withoutCustomHandle && origByte;
}
-
+
//---------------------------------------------
// char
//---------------------------------------------
-
+
// if original char meta class
private static boolean origChar = true;
// if origChar and withoutCustomHandle
private static boolean origCharRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original char meta class is used.
@@ -91,7 +91,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigChar() {
return origCharRes;
}
-
+
/**
* sets if the original char meta class is used
*/
@@ -99,16 +99,16 @@ public class DefaultMetaClassInfo {
origChar = v;
origCharRes = withoutCustomHandle && origChar;
}
-
+
//---------------------------------------------
// short
//---------------------------------------------
-
+
// if original short meta class
private static boolean origShort = true;
// if origShort and withoutCustomHandle
private static boolean origShortRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original short meta class is used.
@@ -116,7 +116,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigShort() {
return origShortRes;
}
-
+
/**
* sets if the original short meta class is used
*/
@@ -124,16 +124,16 @@ public class DefaultMetaClassInfo {
origShort = v;
origShortRes = withoutCustomHandle && origShort;
}
-
+
//---------------------------------------------
// int
//---------------------------------------------
-
+
// if original Integer meta class
private static boolean origInt = true;
// if origInt and withoutCustomHandle
private static boolean origIntRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original integer meta class is used.
@@ -141,7 +141,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigInt() {
return origIntRes;
}
-
+
/**
* sets if the original int meta class is used
*/
@@ -166,7 +166,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigIntArray() {
return origIntArrayWCH;
}
-
+
/**
* sets if the original int array meta class is used
*/
@@ -174,16 +174,16 @@ public class DefaultMetaClassInfo {
origIntArray = v;
origIntArrayWCH = withoutCustomHandle && origIntArray;
}
-
+
//---------------------------------------------
// long
//---------------------------------------------
-
+
// if original long meta class
private static boolean origLong = true;
// if origLong and withoutCustomHandle
private static boolean origLongRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original long meta class is used.
@@ -191,7 +191,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigLong() {
return origLongRes;
}
-
+
/**
* sets if the original long meta class is used
*/
@@ -199,16 +199,16 @@ public class DefaultMetaClassInfo {
origLong = v;
origLongRes = withoutCustomHandle && origLong;
}
-
+
//---------------------------------------------
// float
//---------------------------------------------
-
+
// if original float meta class
private static boolean origFloat = true;
// if origFloat and withoutCustomHandle
private static boolean origFloatRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original float meta class is used.
@@ -216,7 +216,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigFloat() {
return origFloatRes;
}
-
+
/**
* sets if the original float meta class is used
*/
@@ -224,16 +224,16 @@ public class DefaultMetaClassInfo {
origFloat = v;
origFloatRes = withoutCustomHandle && origFloat;
}
-
+
//---------------------------------------------
// double
//---------------------------------------------
-
+
// if original double meta class
private static boolean origDouble = true;
// if origFloat and withoutCustomHandle
private static boolean origDoubleRes = true;
-
+
/**
* @return true if no meta class creation handle is set and if
* the original double meta class is used.
@@ -241,7 +241,7 @@ public class DefaultMetaClassInfo {
public static boolean isOrigDouble() {
return origDoubleRes;
}
-
+
/**
* sets if the original double meta class is used
*/
@@ -249,7 +249,7 @@ public class DefaultMetaClassInfo {
origDouble = v;
origDoubleRes = withoutCustomHandle && origDouble;
}
-
+
//---------------------------------------------
// custom meta class creation handle
//---------------------------------------------
@@ -270,12 +270,12 @@ public class DefaultMetaClassInfo {
//---------------------------------------------
private static boolean categoryUsed = false;
private static boolean disabledStandardMC = false;
-
+
public static void setCategoryUsed(boolean b) {
categoryUsed = b;
disabledStandardMC = b || !withoutCustomHandle;
}
-
+
public static boolean disabledStandardMetaClass() {
return disabledStandardMC;
}
@@ -316,9 +316,9 @@ public class DefaultMetaClassInfo {
} else if (c==Double.class) {
setOrigDouble(orig);
}
-
+
}
-
+
//---------------------------------------------
// GlobalMetaClassVersioning
//---------------------------------------------
@@ -328,11 +328,11 @@ public class DefaultMetaClassInfo {
}
private static ConstantMetaClassVersioning constantMetaClassVersioning = new ConstantMetaClassVersioning();
private static final Object constantMetaClassVersioningLock = new Object();
-
+
public static ConstantMetaClassVersioning getCurrentConstantMetaClassVersioning() {
return constantMetaClassVersioning;
}
-
+
public static ConstantMetaClassVersioning getNewConstantMetaClassVersioning() {
synchronized (constantMetaClassVersioningLock) {
constantMetaClassVersioning.valid = false;
@@ -340,5 +340,5 @@ public class DefaultMetaClassInfo {
return constantMetaClassVersioning;
}
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodHelper.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
index 0d5fc7b..0b0110b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Modifier;
* Some reflection helper methods
*/
public class MethodHelper {
-
+
public static boolean isStatic(Method method) {
int flags = Modifier.STATIC;
return (method.getModifiers() & (flags)) == flags;
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
index b8467d9..6eab6c8 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
@@ -28,7 +28,7 @@ import groovy.lang.MetaProperty;
*/
public class MethodMetaProperty extends MetaProperty {
private final MetaMethod method;
-
+
public MethodMetaProperty(String name, MetaMethod method) {
super(name, Object.class);
this.method = method;
@@ -43,11 +43,11 @@ public class MethodMetaProperty extends MetaProperty {
public void setProperty(Object object, Object newValue) {
throw new UnsupportedOperationException();
}
-
+
public MetaMethod getMetaMethod() {
return method;
}
-
+
/**
* Wrapper for a method realizing the property get.
* WARNING: This class is for internal use only, don't use it for your APIs
@@ -63,7 +63,7 @@ public class MethodMetaProperty extends MetaProperty {
return getMetaMethod().doMethodInvoke(object, new Object[]{name});
}
}
-
+
/**
* Wrapper for a method realizing the property getter.
* WARNING: This class is for internal use only, don't use it for your APIs
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
index c5a5c49..87f9660 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
@@ -40,7 +40,7 @@ public class MethodSelectionException extends GroovyRuntimeException {
private final String methodName;
private final FastArray methods;
private final Class[] arguments;
-
+
/**
* Creates a new MethodSelectionException.
* @param methodName name of the method
@@ -63,8 +63,8 @@ public class MethodSelectionException extends GroovyRuntimeException {
appendMethods(buffer);
return buffer.toString();
}
-
-
+
+
private static void appendClassNames(StringBuilder argBuf, Class[] classes) {
argBuf.append("(");
for (int i = 0; i < classes.length; i++) {
@@ -77,7 +77,7 @@ public class MethodSelectionException extends GroovyRuntimeException {
}
argBuf.append(")");
}
-
+
private void appendMethods(StringBuilder buffer) {
for (int i = 0; i < methods.size; i++) {
buffer.append("\n ");
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
index 4a8bd7b..ca38d2f 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
@@ -42,7 +42,7 @@ public class ReflectorLoader extends ClassLoader {
private final ClassLoader delegatationLoader;
private static final String REFLECTOR = Reflector.class.getName();
-
+
/**
* Tries to find a Groovy class.
*
@@ -54,7 +54,7 @@ public class ReflectorLoader extends ClassLoader {
if (delegatationLoader==null) return super.findClass(name);
return delegatationLoader.loadClass(name);
}
-
+
/**
* Loads a class per name. Unlike a normal loadClass this version
* behaves different during a class definition. In that case it
@@ -74,7 +74,7 @@ public class ReflectorLoader extends ClassLoader {
}
return super.loadClass(name, resolve);
}
-
+
/**
* helper method to define Reflector classes.
* @param name of the Reflector
@@ -90,7 +90,7 @@ public class ReflectorLoader extends ClassLoader {
inDefine = false;
return c;
}
-
+
/**
* creates a ReflectorLoader.
* @param parent the parent loader. This should never be null!
@@ -99,7 +99,7 @@ public class ReflectorLoader extends ClassLoader {
super(parent);
delegatationLoader = getClass().getClassLoader();
}
-
+
/**
* try to load one of the defined Reflector classes by name.
* @param name of the Reflector class
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
index 2790217..a00802b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
@@ -48,7 +48,7 @@ public class ThreadManagedMetaBeanProperty extends MetaBeanProperty {
private final ThreadBoundSetter setter;
private Object initialValue;
private Closure initialValueCreator;
-
+
private static final ReferenceBundle SOFT_BUNDLE = ReferenceBundle.getSoftBundle();
/**
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
index 299dae6..362944c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
@@ -24,14 +24,14 @@ package org.codehaus.groovy.runtime.typehandling;
public final class BigIntegerMath extends NumberMath {
public static final BigIntegerMath INSTANCE = new BigIntegerMath();
-
+
private BigIntegerMath() {}
@Override
protected Number absImpl(Number number) {
return toBigInteger(number).abs();
}
-
+
@Override
public Number addImpl(Number left, Number right) {
return toBigInteger(left).add(toBigInteger(right));
@@ -50,7 +50,7 @@ public final class BigIntegerMath extends NumberMath {
public Number divideImpl(Number left, Number right) {
return BigDecimalMath.INSTANCE.divideImpl(left, right);
}
-
+
@Override
public int compareToImpl(Number left, Number right) {
return toBigInteger(left).compareTo(toBigInteger(right));
@@ -60,12 +60,12 @@ public final class BigIntegerMath extends NumberMath {
protected Number intdivImpl(Number left, Number right) {
return toBigInteger(left).divide(toBigInteger(right));
}
-
+
@Override
protected Number modImpl(Number left, Number right) {
return toBigInteger(left).mod(toBigInteger(right));
}
-
+
@Override
protected Number unaryMinusImpl(Number left) {
return toBigInteger(left).negate();
@@ -90,7 +90,7 @@ public final class BigIntegerMath extends NumberMath {
protected Number andImpl(Number left, Number right) {
return toBigInteger(left).and(toBigInteger(right));
}
-
+
@Override
protected Number xorImpl(Number left, Number right) {
return toBigInteger(left).xor(toBigInteger(right));
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
index 9df2ba0..68ada03 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
@@ -24,14 +24,14 @@ package org.codehaus.groovy.runtime.typehandling;
public final class FloatingPointMath extends NumberMath {
public static final FloatingPointMath INSTANCE = new FloatingPointMath();
-
+
private FloatingPointMath() {}
-
+
@Override
protected Number absImpl(Number number) {
return Math.abs(number.doubleValue());
}
-
+
@Override
public Number addImpl(Number left, Number right) {
return left.doubleValue() + right.doubleValue();
@@ -56,12 +56,12 @@ public final class FloatingPointMath extends NumberMath {
public int compareToImpl(Number left, Number right) {
return Double.compare(left.doubleValue(), right.doubleValue());
}
-
+
@Override
protected Number modImpl(Number left, Number right) {
return left.doubleValue() % right.doubleValue();
}
-
+
@Override
protected Number unaryMinusImpl(Number left) {
return -left.doubleValue();
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/IntegerMath.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
index 1a0be72..dd69b8c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
@@ -26,12 +26,12 @@ public final class IntegerMath extends NumberMath {
public static final IntegerMath INSTANCE = new IntegerMath();
private IntegerMath() {}
-
+
@Override
protected Number absImpl(Number number) {
return Math.abs(number.intValue());
}
-
+
@Override
public Number addImpl(Number left, Number right) {
return left.intValue() + right.intValue();
@@ -51,7 +51,7 @@ public final class IntegerMath extends NumberMath {
public Number divideImpl(Number left, Number right) {
return BigDecimalMath.INSTANCE.divideImpl(left, right);
}
-
+
@Override
public int compareToImpl(Number left, Number right) {
int leftVal = left.intValue();
@@ -78,7 +78,7 @@ public final class IntegerMath extends NumberMath {
protected Number intdivImpl(Number left, Number right) {
return left.intValue() / right.intValue();
}
-
+
@Override
protected Number modImpl(Number left, Number right) {
return left.intValue() % right.intValue();
diff --git a/src/main/java/org/codehaus/groovy/runtime/typehandling/LongMath.java b/src/main/java/org/codehaus/groovy/runtime/typehandling/LongMath.java
index 88a2224..f258e29 100644
--- a/src/main/java/org/codehaus/groovy/runtime/typehandling/LongMath.java
+++ b/src/main/java/org/codehaus/groovy/runtime/typehandling/LongMath.java
@@ -26,12 +26,12 @@ public final class LongMath extends NumberMath {
public static final LongMath INSTANCE = new LongMath();
private LongMath() {}
-
+
@Override
protected Number absImpl(Number number) {
return Math.abs(number.longValue());
}
-
+
@Override
public Number addImpl(Number left, Number right) {
return left.longValue() + right.longValue();
@@ -51,7 +51,7 @@ public final class LongMath extends NumberMath {
public Number divideImpl(Number left, Number right) {
return BigDecimalMath.INSTANCE.divideImpl(left, right);
}
-
+
@Override
public int compareToImpl(Number left, Number right) {
long leftVal = left.longValue();
@@ -63,12 +63,12 @@ public final class LongMath extends NumberMath {
protected Number intdivImpl(Number left, Number right) {
return left.longValue() / right.longValue();
}
-
+
@Override
protected Number modImpl(Number left, Number right) {
return left.longValue() % right.longValue();
}
-
+
@Override
protected Number unaryMinusImpl(Number left) {
return -left.longValue();
@@ -83,7 +83,7 @@ public final class LongMath extends NumberMath {
protected Number bitwiseNegateImpl(Number left) {
return ~left.longValue();
}
-
+
@Override
protected Number orImpl(Number left, Number right) {
return left.longValue() | right.longValue();
@@ -93,12 +93,12 @@ public final class LongMath extends NumberMath {
protected Number andImpl(Number left, Number right) {
return left.longValue() & right.longValue();
}
-
+
@Override
protected Number xorImpl(Number left, Number right) {
return left.longValue() ^ right.longValue();
}
-
+
@Override
protected Number leftShiftImpl(Number left, Number right) {
return left.longValue() << right.longValue();
diff --git a/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java b/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
index 16da226..17a567a 100644
--- a/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
+++ b/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
@@ -94,7 +94,7 @@ public class ASTHelper {
public void setController(SourceUnit controller) {
this.controller = controller;
}
-
+
/**
* @return Two names joined by a dot. If the base name is
* empty, returns the name unchanged.
diff --git a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
index 5ad37bf..4bffd72 100644
--- a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
+++ b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
@@ -33,12 +33,12 @@ public class GroovyStarter {
System.out.println("possible programs are 'groovyc','groovy','console', and 'groovysh'");
System.exit(1);
}
-
-
+
+
public static void rootLoader(String[] args) {
String conf = System.getProperty("groovy.starter.conf",null);
final LoaderConfiguration lc = new LoaderConfiguration();
-
+
// evaluate parameters
boolean hadMain=false, hadConf=false, hadCP=false;
int argsOffset = 0;
@@ -85,7 +85,7 @@ public class GroovyStarter {
if (lc.getMainClass()==null && conf==null) {
exit("no configuration file or main class specified");
}
-
+
// copy arguments for main class
String[] newArgs = new String[args.length-argsOffset];
System.arraycopy(args, 0 + argsOffset, newArgs, 0, newArgs.length);
@@ -113,17 +113,17 @@ public class GroovyStarter {
exit(e3);
}
}
-
+
private static void exit(Exception e) {
e.printStackTrace();
System.exit(1);
}
-
+
private static void exit(String msg) {
System.err.println(msg);
System.exit(1);
}
-
+
public static void main(String[] args) {
try {
rootLoader(args);
diff --git a/src/main/java/org/codehaus/groovy/tools/Utilities.java b/src/main/java/org/codehaus/groovy/tools/Utilities.java
index 41a7b00..3715b14 100644
--- a/src/main/java/org/codehaus/groovy/tools/Utilities.java
+++ b/src/main/java/org/codehaus/groovy/tools/Utilities.java
@@ -71,7 +71,7 @@ public abstract class Utilities
}
return true;
}
-
+
private static String eol = System.lineSeparator();
}
diff --git a/src/main/java/org/codehaus/groovy/tools/gse/DependencyTracker.java b/src/main/java/org/codehaus/groovy/tools/gse/DependencyTracker.java
index ab27d54..daaac1c 100644
--- a/src/main/java/org/codehaus/groovy/tools/gse/DependencyTracker.java
+++ b/src/main/java/org/codehaus/groovy/tools/gse/DependencyTracker.java
@@ -46,7 +46,7 @@ public class DependencyTracker extends ClassCodeVisitorSupport {
public DependencyTracker(SourceUnit source, StringSetMap cache) {
this(source, cache, new HashMap());
}
-
+
public DependencyTracker(SourceUnit source, StringSetMap cache, Map<String, ?> precompiledEntries) {
this.source = source;
this.cache = cache;
@@ -65,7 +65,7 @@ public class DependencyTracker extends ClassCodeVisitorSupport {
addToCache(node.getSuperClass());
addToCache(node.getInterfaces());
}
-
+
private void addToCache(ClassNode[] nodes){
if (nodes==null) return;
for (ClassNode node : nodes) addToCache(node);
diff --git a/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java b/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java
index 379c4c2..88c7fb5 100644
--- a/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java
+++ b/src/main/java/org/codehaus/groovy/tools/gse/StringSetMap.java
@@ -30,13 +30,13 @@ public class StringSetMap extends LinkedHashMap<String,Set<String>> {
public StringSetMap() {
super();
}
-
+
public StringSetMap(StringSetMap other) {
for (String key : other.keySet()) {
get(key).addAll(other.get(key));
}
}
-
+
@Override
public Set<String> get(Object o){
String name = (String) o;
@@ -50,7 +50,7 @@ public class StringSetMap extends LinkedHashMap<String,Set<String>> {
public void makeTransitiveHull() {
Set<String> nameSet = new TreeSet<String>(keySet());
-
+
for (String k: nameSet) {
StringSetMap delta = new StringSetMap();
for (String i: nameSet) {
diff --git a/src/main/java/org/codehaus/groovy/tools/shell/util/Logger.java b/src/main/java/org/codehaus/groovy/tools/shell/util/Logger.java
index 4fdf9fa..9e53055 100644
--- a/src/main/java/org/codehaus/groovy/tools/shell/util/Logger.java
+++ b/src/main/java/org/codehaus/groovy/tools/shell/util/Logger.java
@@ -37,7 +37,7 @@ public final class Logger {
assert name != null;
this.name = name;
}
-
+
private void log(final String level, Object msg, Throwable cause) {
assert level != null;
assert msg != null;
@@ -86,7 +86,7 @@ public final class Logger {
//
// Level helpers
//
-
+
private static final String DEBUG = "DEBUG";
public boolean isDebugEnabled() {
@@ -96,13 +96,13 @@ public final class Logger {
public boolean isDebug() {
return isDebugEnabled();
}
-
+
public void debug(final Object msg) {
if (isDebugEnabled()) {
log(DEBUG, msg, null);
}
}
-
+
public void debug(final Object msg, final Throwable cause) {
if (isDebugEnabled()) {
log(DEBUG, msg, cause);
@@ -118,7 +118,7 @@ public final class Logger {
public void warn(final Object msg, final Throwable cause) {
log(WARN, msg, cause);
}
-
+
private static final String ERROR = "ERROR";
public void error(final Object msg) {
@@ -132,7 +132,7 @@ public final class Logger {
//
// Factory access
//
-
+
public static Logger create(final Class type) {
return new Logger(type.getName());
}
diff --git a/src/main/java/org/codehaus/groovy/tools/shell/util/MessageSource.java b/src/main/java/org/codehaus/groovy/tools/shell/util/MessageSource.java
index 35b0383..ead7bcd 100644
--- a/src/main/java/org/codehaus/groovy/tools/shell/util/MessageSource.java
+++ b/src/main/java/org/codehaus/groovy/tools/shell/util/MessageSource.java
@@ -32,70 +32,70 @@ public class MessageSource
extends GroovyObjectSupport
{
private final String[] bundleNames;
-
+
private ResourceBundle[] cachedBundles;
-
+
public MessageSource(final String[] names) {
assert names != null;
assert names.length != 0;
-
+
this.bundleNames = names;
}
-
+
public MessageSource(final String name) {
this(new String[] { name });
}
-
+
private static String[] classNames(final Class[] types) {
assert types != null;
assert types.length != 0;
-
+
String[] names = new String[types.length];
-
+
for (int i=0; i<types.length; i++) {
assert types[i] != null;
-
+
names[i] = types[i].getName();
}
-
+
return names;
}
-
+
public MessageSource(final Class[] types) {
this(classNames(types));
}
-
+
public MessageSource(final Class type) {
this(new String[] { type.getName() });
}
-
+
private ResourceBundle[] createBundles() {
ResourceBundle[] bundles = new ResourceBundle[bundleNames.length];
-
+
for (int i=0; i<bundleNames.length; i++) {
assert bundleNames[i] != null;
-
+
bundles[i] = ResourceBundle.getBundle(bundleNames[i]);
}
-
+
return bundles;
}
-
+
private ResourceBundle[] getBundles() {
if (cachedBundles == null) {
cachedBundles = createBundles();
}
return cachedBundles;
}
-
+
/**
* Get a raw message from the resource bundles using the given code.
*/
public String getMessage(final String code) {
assert code != null;
-
+
MissingResourceException error = null;
-
+
ResourceBundle[] bundles = getBundles();
for (ResourceBundle bundle : bundles) {
@@ -111,12 +111,12 @@ public class MessageSource
}
}
}
-
+
assert error != null;
-
+
throw error;
}
-
+
/**
* Format a message (based on {@link MessageFormat} using the message
* from the resource bundles using the given code as a pattern and the
@@ -124,12 +124,12 @@ public class MessageSource
*/
public String format(final String code, final Object[] args) {
assert args != null;
-
+
String pattern = getMessage(code);
-
+
return MessageFormat.format(pattern, args);
}
-
+
/**
* @see #getMessage(String)
*/
diff --git a/src/main/java/org/codehaus/groovy/tools/shell/util/Preferences.java b/src/main/java/org/codehaus/groovy/tools/shell/util/Preferences.java
index f52e1ef..5d37b81 100644
--- a/src/main/java/org/codehaus/groovy/tools/shell/util/Preferences.java
+++ b/src/main/java/org/codehaus/groovy/tools/shell/util/Preferences.java
@@ -93,7 +93,7 @@ public class Preferences
//
// Store Access
//
-
+
public static String[] keys() throws BackingStoreException {
return STORE.keys();
}
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
index 71dd5fd..82e8261 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
@@ -74,7 +74,7 @@ public class BooleanExpressionTransformer {
}
return transformer.superTransform(booleanExpression);
}
-
+
private static boolean isExtended(ClassNode owner, Iterator<InnerClassNode> classes) {
while (classes.hasNext()) {
InnerClassNode next = classes.next();
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java b/src/main/java/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
index 3adc458..dbb545c 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
@@ -30,7 +30,7 @@ import org.codehaus.groovy.ast.stmt.Statement;
public class ExtensionMethodNode extends MethodNode {
private final MethodNode extensionMethodNode;
private final boolean isStaticExtension; // true if it's a static method
-
+
public ExtensionMethodNode(
MethodNode extensionMethodNode,
String name, int modifiers, ClassNode returnType, Parameter[] parameters, ClassNode[] exceptions, Statement code, boolean isStaticExtension) {
diff --git a/src/main/java/org/codehaus/groovy/util/LazyReference.java b/src/main/java/org/codehaus/groovy/util/LazyReference.java
index b3110c9..bd091dd 100644
--- a/src/main/java/org/codehaus/groovy/util/LazyReference.java
+++ b/src/main/java/org/codehaus/groovy/util/LazyReference.java
@@ -27,11 +27,11 @@ public abstract class LazyReference<T> extends LockableObject {
private static final long serialVersionUID = -828564509716680325L;
private ManagedReference<T> reference = INIT;
private final ReferenceBundle bundle;
-
+
public LazyReference(ReferenceBundle bundle) {
this.bundle = bundle;
}
-
+
public T get() {
ManagedReference<T> resRef = reference;
if (resRef == INIT) return getLocked(false);
diff --git a/src/main/java/org/codehaus/groovy/util/ManagedConcurrentValueMap.java b/src/main/java/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
index 9f04902..62b0092 100644
--- a/src/main/java/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
+++ b/src/main/java/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
@@ -36,7 +36,7 @@ public class ManagedConcurrentValueMap<K,V> {
this.bundle = bundle;
internalMap = new ConcurrentHashMap<K, ManagedReference<V>>();
}
-
+
/**
* Sets a new bundle used for reference creation. Be warned that
* older entries will not be changed by this
@@ -72,5 +72,5 @@ public class ManagedConcurrentValueMap<K,V> {
};
internalMap.put(key, ref);
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/util/ManagedReference.java b/src/main/java/org/codehaus/groovy/util/ManagedReference.java
index 0f4e62d..2d5a997 100644
--- a/src/main/java/org/codehaus/groovy/util/ManagedReference.java
+++ b/src/main/java/org/codehaus/groovy/util/ManagedReference.java
@@ -22,29 +22,29 @@ public class ManagedReference<T> implements Finalizable {
private static final ReferenceManager NULL_MANAGER = new ReferenceManager(null){};
private final Reference<T,ManagedReference<T>> ref;
private final ReferenceManager manager;
-
+
public ManagedReference(ReferenceType type, ReferenceManager rmanager, T value) {
if (rmanager==null) rmanager = NULL_MANAGER;
this.manager = rmanager;
this.ref = type.createReference(value, this, rmanager.getReferenceQueue());
rmanager.afterReferenceCreation(ref);
}
-
+
public ManagedReference(ReferenceBundle bundle, T value) {
this(bundle.getType(),bundle.getManager(),value);
}
-
+
public final T get() {
return ref.get();
}
-
+
public final void clear() {
ref.clear();
manager.removeStallEntries();
}
-
+
@Override
public void finalizeReference(){
ref.clear();
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/org/codehaus/groovy/util/ReferenceBundle.java b/src/main/java/org/codehaus/groovy/util/ReferenceBundle.java
index 9c70332..f5d9941 100644
--- a/src/main/java/org/codehaus/groovy/util/ReferenceBundle.java
+++ b/src/main/java/org/codehaus/groovy/util/ReferenceBundle.java
@@ -33,7 +33,7 @@ public class ReferenceBundle{
public ReferenceManager getManager() {
return manager;
}
-
+
private static final ReferenceBundle softReferences, weakReferences, hardReferences, phantomReferences;
static {
ReferenceQueue queue = new ReferenceQueue();
diff --git a/src/main/java/org/codehaus/groovy/util/ReferenceManager.java b/src/main/java/org/codehaus/groovy/util/ReferenceManager.java
index 195b46c..dfd96953 100644
--- a/src/main/java/org/codehaus/groovy/util/ReferenceManager.java
+++ b/src/main/java/org/codehaus/groovy/util/ReferenceManager.java
@@ -124,7 +124,7 @@ public class ReferenceManager {
public static ReferenceManager createThresholdedIdlingManager(final ReferenceQueue queue, final ReferenceManager callback, final int threshold) {
if (threshold<0) throw new IllegalArgumentException("threshold must not be below 0.");
-
+
return new ReferenceManager(queue){
private AtomicInteger refCnt = new AtomicInteger();
private volatile ReferenceManager manager = createIdlingManager(queue);
@@ -160,21 +160,21 @@ public class ReferenceManager {
}
};
}
-
+
private ReferenceQueue queue;
-
+
public ReferenceManager(ReferenceQueue queue) {
this.queue = queue;
}
-
+
protected ReferenceQueue getReferenceQueue() {
return queue;
}
-
+
public void afterReferenceCreation(Reference r) {}
public void removeStallEntries() {}
public void stopThread() {}
-
+
@Override
public String toString() {
return "ReferenceManager(idling)";
diff --git a/src/main/java/org/codehaus/groovy/util/ReferenceType.java b/src/main/java/org/codehaus/groovy/util/ReferenceType.java
index 63b15e5..a59ebc1 100644
--- a/src/main/java/org/codehaus/groovy/util/ReferenceType.java
+++ b/src/main/java/org/codehaus/groovy/util/ReferenceType.java
@@ -50,7 +50,7 @@ public enum ReferenceType {
}
};
protected abstract <T,V extends Finalizable> Reference<T,V> createReference(T value, V handler, ReferenceQueue queue);
-
+
private static class SoftRef<TT,V extends Finalizable> extends SoftReference<TT> implements Reference<TT,V> {
private final V handler;
public SoftRef(TT referent, V handler, ReferenceQueue<? super TT> q) {
@@ -62,7 +62,7 @@ public enum ReferenceType {
return handler;
}
}
-
+
private static class WeakRef<TT,V extends Finalizable> extends WeakReference<TT> implements Reference<TT,V> {
private final V handler;
public WeakRef(TT referent, V handler, ReferenceQueue<? super TT> q) {
@@ -74,7 +74,7 @@ public enum ReferenceType {
return handler;
}
}
-
+
private static class PhantomRef<TT,V extends Finalizable> extends PhantomReference<TT> implements Reference<TT,V> {
private final V handler;
public PhantomRef(TT referent, V handler, ReferenceQueue<? super TT> q) {
@@ -86,7 +86,7 @@ public enum ReferenceType {
return handler;
}
}
-
+
private static class HardRef<TT,V extends Finalizable> implements Reference<TT,V> {
private TT ref;
private final V handler;
@@ -107,5 +107,5 @@ public enum ReferenceType {
ref = null;
}
}
-
+
}
diff --git a/src/main/java/org/codehaus/groovy/util/ReleaseInfo.java b/src/main/java/org/codehaus/groovy/util/ReleaseInfo.java
index ee8122b..267e368 100644
--- a/src/main/java/org/codehaus/groovy/util/ReleaseInfo.java
+++ b/src/main/java/org/codehaus/groovy/util/ReleaseInfo.java
@@ -62,15 +62,15 @@ public class ReleaseInfo {
}
}
}
-
+
public static String getVersion() {
return get(KEY_IMPLEMENTATION_VERSION);
}
-
+
public static Properties getAllProperties() {
return RELEASE_INFO;
}
-
+
private static String get(String propName) {
String propValue = RELEASE_INFO.getProperty(propName);
return (propValue == null ? "" : propValue);
diff --git a/src/spec/doc/_design-pattern-flyweight.adoc b/src/spec/doc/_design-pattern-flyweight.adoc
index e5558c3..871149d 100644
--- a/src/spec/doc/_design-pattern-flyweight.adoc
+++ b/src/spec/doc/_design-pattern-flyweight.adoc
@@ -32,7 +32,6 @@ In such circumstances, we call the state that is shared with many other things (
First we are going to model some complex aircraft (the first being a hoax competitor of the second - though that is not relevant to the example).
-
[source,groovy]
----
include::../test/DesignPatternsTest.groovy[tags=flyweight_boeing797,indent=0]
diff --git a/src/spec/doc/_design-pattern-loan-my-resource.adoc b/src/spec/doc/_design-pattern-loan-my-resource.adoc
index c23e333..21ee0fa 100644
--- a/src/spec/doc/_design-pattern-loan-my-resource.adoc
+++ b/src/spec/doc/_design-pattern-loan-my-resource.adoc
@@ -21,7 +21,6 @@
= Loan my Resource Pattern
-
The https://wiki.scala-lang.org/display/SYGN/Loan[Loan my Resource] pattern ensures that a resource is deterministically disposed of once it goes out of scope.
This pattern is built in to many Groovy helper methods. You should consider using it yourself if you need to work with resources in ways beyond what Groovy supports.
diff --git a/src/spec/doc/_design-pattern-proxy.adoc b/src/spec/doc/_design-pattern-proxy.adoc
index 2b0777a..2af4915 100644
--- a/src/spec/doc/_design-pattern-proxy.adoc
+++ b/src/spec/doc/_design-pattern-proxy.adoc
@@ -21,7 +21,6 @@
= Proxy Pattern
-
The https://en.wikipedia.org/wiki/Proxy_pattern[Proxy Pattern] allows one object to act as a pretend replacement for some other object. In general, whoever is using the proxy, doesn't realise that they are not using the real thing. The pattern is useful when the real object is hard to create or use: it may exist over a network connection, or be a large object in memory, or be a file, database or some other resource that is expensive or impossible to duplicate.
== Example
diff --git a/src/spec/doc/_design-pattern-state.adoc b/src/spec/doc/_design-pattern-state.adoc
index 12c7899..876eaf5 100644
--- a/src/spec/doc/_design-pattern-state.adoc
+++ b/src/spec/doc/_design-pattern-state.adoc
@@ -21,7 +21,6 @@
= State Pattern
-
The https://en.wikipedia.org/wiki/State_pattern[State Pattern] provides a structured approach to partitioning the behaviour within complex systems. The overall behaviour of a system is partitioned into well-defined states. Typically, each state is implemented by a class. The overall system behaviour can be determined firstly by knowing the __current state__ of the system; secondly, by understanding the behaviour possible while in that state (as embodied in the methods of the class corres [...]
== Example
diff --git a/src/spec/doc/_design-pattern-visitor.adoc b/src/spec/doc/_design-pattern-visitor.adoc
index 20697b2..0b6e9a5 100644
--- a/src/spec/doc/_design-pattern-visitor.adoc
+++ b/src/spec/doc/_design-pattern-visitor.adoc
@@ -21,7 +21,6 @@
= Visitor Pattern
-
The https://en.wikipedia.org/wiki/Visitor_pattern[Visitor Pattern] is one of those well-known but not
often used patterns. Perhaps this is because it seems a little complex at first.
But once you become familiar with it, it becomes a powerful way to evolve your code
diff --git a/src/spec/doc/core-domain-specific-languages.adoc b/src/spec/doc/core-domain-specific-languages.adoc
index 66a0b76..aba0332 100644
--- a/src/spec/doc/core-domain-specific-languages.adoc
+++ b/src/spec/doc/core-domain-specific-languages.adoc
@@ -1773,7 +1773,7 @@ gapi:groovy.util.FileTreeBuilder[FileTreeBuilder] is a builder for generating a
|--- groovy
|--- FooTest.groovy
---------
-
+
You can use a `FileTreeBuilder` like this:
[source,groovy]
diff --git a/src/spec/doc/design-patterns-in-groovy.adoc b/src/spec/doc/design-patterns-in-groovy.adoc
index d951f58..eace788 100644
--- a/src/spec/doc/design-patterns-in-groovy.adoc
+++ b/src/spec/doc/design-patterns-in-groovy.adoc
@@ -21,7 +21,6 @@
= Design patterns in Groovy
-
Using https://en.wikipedia.org/wiki/Design_pattern_%28computer_science%29[design patterns] with Java is a well-established topic.
Design patterns also apply to Groovy:
@@ -79,7 +78,7 @@ include::_design-pattern-visitor.adoc[leveloffset=+2]
* _The canonical reference of design patterns._
. Martin Fowler (1999). _Refactoring: Improving the Design of Existing Code_. Addison-Wesley. ISBN 0-201-48567-2.
. Joshua Kerievsky (2004). _Refactoring To Patterns_. Addison-Wesley. ISBN 0-321-21335-1.
-. Eric Freeman, Elisabeth Freeman, Kathy Sierra, Bert Bates (2004). _Head First Design Patterns_. O’Reilly. ISBN 0-596-00712-4.
+. Eric Freeman, Elisabeth Freeman, Kathy Sierra, Bert Bates (2004). _Head First Design Patterns_. O’Reilly. ISBN 0-596-00712-4.
*_A great book to read, informative as well as amusing._
. Dierk Koenig with Andrew Glover, Paul King, Guillaume Laforge and Jon Skeet (2007). _Groovy in Action_. Manning. ISBN 1-932394-84-2.
* _Discusses Visitor, Builder and other Patterns._
diff --git a/src/spec/test/ClassTest.groovy b/src/spec/test/ClassTest.groovy
index 427a760..5748e1a 100644
--- a/src/spec/test/ClassTest.groovy
+++ b/src/spec/test/ClassTest.groovy
@@ -47,7 +47,7 @@ class ClassTest extends GroovyTestCase {
class Computer {
class Cpu {
int coreNumber
-
+
Cpu(int coreNumber) {
this.coreNumber = coreNumber
}
diff --git a/src/spec/test/CompilerDirectivesASTTransformsTest.groovy b/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
index bbc5c22..781aa1b 100644
--- a/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
+++ b/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
@@ -111,11 +111,11 @@ class Person {
this.first = first
this.last = last
}
-
+
String fullName(String separator) {
"$first$separator$last"
}
-
+
String greeting(String salutation) {
"$salutation, $first"
}
diff --git a/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy b/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
index 60a218a..4ba2a71 100644
--- a/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
+++ b/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
@@ -75,7 +75,7 @@ import java.util.concurrent.TimeUnit
class Counter {
int cpt
private final Object myLock = new Object()
-
+
@Synchronized('myLock')
int incrementAndGet() {
cpt++
diff --git a/src/spec/test/DesignPatternsTest.groovy b/src/spec/test/DesignPatternsTest.groovy
index 71204c6..98a7444 100644
--- a/src/spec/test/DesignPatternsTest.groovy
+++ b/src/spec/test/DesignPatternsTest.groovy
@@ -334,11 +334,11 @@ class DesignPatternsTest extends CompilableTestSupport {
// invoker class
class Switch {
private final Map<String, Command> commandMap = new HashMap<>()
-
+
void register(String commandName, Command command) {
commandMap[commandName] = command
}
-
+
void execute(String commandName) {
Command command = commandMap[commandName]
if (!command) {
@@ -353,7 +353,7 @@ class DesignPatternsTest extends CompilableTestSupport {
void turnOn() {
println "The light is on"
}
-
+
void turnOff() {
println "The light is off"
}
@@ -361,7 +361,7 @@ class DesignPatternsTest extends CompilableTestSupport {
class SwitchOnCommand implements Command {
Light light
-
+
@Override // Command
void execute() {
light.turnOn()
@@ -370,7 +370,7 @@ class DesignPatternsTest extends CompilableTestSupport {
class SwitchOffCommand implements Command {
Light light
-
+
@Override // Command
void execute() {
light.turnOff()
@@ -398,11 +398,11 @@ class DesignPatternsTest extends CompilableTestSupport {
// invoker class
class Switch {
private final Map<String, Command> commandMap = [:]
-
+
void register(String commandName, Command command) {
commandMap[commandName] = command
}
-
+
void execute(String commandName) {
Command command = commandMap[commandName]
if (!command) {
@@ -417,7 +417,7 @@ class DesignPatternsTest extends CompilableTestSupport {
void turnOn() {
println 'The light is on'
}
-
+
void turnOff() {
println 'The light is off'
}
@@ -439,7 +439,7 @@ class DesignPatternsTest extends CompilableTestSupport {
void turnOn() {
println 'The light is on'
}
-
+
void turnOff() {
println 'The light is off'
}
@@ -698,7 +698,7 @@ class DesignPatternsTest extends CompilableTestSupport {
("-" * indent) + name
}
}
-
+
class Composite extends Component {
private children = []
def toString(indent) {
@@ -1233,7 +1233,7 @@ class DesignPatternsTest extends CompilableTestSupport {
// tag::loan_my_resource_example5[]
withListOfWordsForEachLine(f) { wordList ->
- println wordList
+ println wordList
}
// =>
// [ "Mon", "Jun", "18", "22:38:17", "EST", "2007" ]
@@ -1246,17 +1246,17 @@ class DesignPatternsTest extends CompilableTestSupport {
assertScript '''
// tag::monoids_intro[]
def nums = [1, 2, 3, 4]
-
+
def sum = 0 // <1>
for (num in nums) { sum += num } // <2>
assert sum == 10
-
+
def product = 1 // <1>
for (num in nums) { product *= num } // <2>
assert product == 24
-
+
def letters = ['a', 'b', 'c']
-
+
def concat = '' // <1>
for (letter in letters) { concat += letter } // <2>
assert concat == 'abc'
@@ -1398,7 +1398,7 @@ class DesignPatternsTest extends CompilableTestSupport {
// tag::null_object_tree_example[]
class NullHandlingTree {
def left, right, value
-
+
def size() {
1 + (left ? left.size() : 0) + (right ? right.size() : 0)
}
@@ -1433,7 +1433,7 @@ class DesignPatternsTest extends CompilableTestSupport {
// tag::null_object_tree_example2[]
class Tree {
def left = new NullTree(), right = new NullTree(), value
-
+
def size() {
1 + left.size() + right.size()
}
@@ -1982,18 +1982,18 @@ class DesignPatternsTest extends CompilableTestSupport {
void testStateVariation2() {
shouldCompile '''
interface State { }
-
+
// tag::state_variation1_impl[]
class Client implements State {
- // ... as before ...
+ // ... as before ...
}
class Online implements State {
- // ... as before ...
+ // ... as before ...
}
class Offline implements State {
- // ... as before ...
+ // ... as before ...
}
// end::state_variation1_impl[]
'''
diff --git a/src/spec/test/PackageTest.groovy b/src/spec/test/PackageTest.groovy
index a143f6e..97ceb28 100644
--- a/src/spec/test/PackageTest.groovy
+++ b/src/spec/test/PackageTest.groovy
@@ -28,11 +28,11 @@ class PackageTest extends GroovyTestCase {
// end::package_statement[]
class Foo {
-
+
}
-
+
def foo = new Foo()
-
+
assert foo != null
assert Foo.class.name == 'com.yoursite.Foo'
'''
@@ -41,10 +41,10 @@ class PackageTest extends GroovyTestCase {
//tag::import_statement[]
// importing the class MarkupBuilder
import groovy.xml.MarkupBuilder
-
+
// using the imported class to create an object
def xml = new MarkupBuilder()
-
+
assert xml != null
// end::import_statement[]
'''
@@ -63,11 +63,11 @@ class PackageTest extends GroovyTestCase {
// tag::multiple_import[]
import groovy.xml.MarkupBuilder
import groovy.xml.StreamingMarkupBuilder
-
+
def markupBuilder = new MarkupBuilder()
-
+
assert markupBuilder != null
-
+
assert new StreamingMarkupBuilder() != null
// end::multiple_import[]
'''
@@ -77,13 +77,13 @@ class PackageTest extends GroovyTestCase {
assertScript '''
// tag::star_import[]
import groovy.xml.*
-
+
def markupBuilder = new MarkupBuilder()
-
+
assert markupBuilder != null
-
+
assert new StreamingMarkupBuilder() != null
-
+
// end::star_import[]
'''
}
@@ -91,24 +91,24 @@ class PackageTest extends GroovyTestCase {
void testStaticImports() {
assertScript '''
// tag::static_imports[]
-
+
import static Boolean.FALSE
-
+
assert !FALSE //use directly, without Boolean prefix!
-
+
// end::static_imports[]
-
+
'''
}
void testStaticImportWithAs() {
assertScript '''
// tag::static_importswithas[]
-
+
import static Calendar.getInstance as now
-
+
assert now().class == Calendar.getInstance().class
-
+
// end::static_importswithas[]
'''
}
@@ -116,27 +116,27 @@ class PackageTest extends GroovyTestCase {
void testStaticStarImport() {
assertScript '''
// tag::static_importswithstar[]
-
+
import static java.lang.Math.*
-
+
assert sin(0) == 0.0
assert cos(0) == 1.0
-
+
// end::static_importswithstar[]
'''
}
-
+
void testStaticStarImportSameMethodNameDifferentParameterType() {
assertScript '''
// tag::static_import_same_method_name_different_parameter_type[]
import static java.lang.String.format // <1>
class SomeClass {
-
+
String format(Integer i) { // <2>
i.toString()
}
-
+
static void main(String[] args) {
assert format('String') == 'String' // <3>
assert new SomeClass().format(Integer.valueOf(1)) == '1'
@@ -145,7 +145,7 @@ class PackageTest extends GroovyTestCase {
// end::static_import_same_method_name_different_parameter_type[]
'''
}
-
+
void testAliasImport() {
assertScript '''
// tag::alias_import[]
@@ -154,7 +154,7 @@ class PackageTest extends GroovyTestCase {
Date utilDate = new Date(1000L)
SQLDate sqlDate = new SQLDate(1000L)
-
+
assert utilDate instanceof java.util.Date
assert sqlDate instanceof java.sql.Date
// end::alias_import[]
diff --git a/src/spec/test/SyntaxTest.groovy b/src/spec/test/SyntaxTest.groovy
index be9b661..521d744 100644
--- a/src/spec/test/SyntaxTest.groovy
+++ b/src/spec/test/SyntaxTest.groovy
@@ -27,16 +27,16 @@ class SyntaxTest extends CompilableTestSupport {
short xShort = 011
assert xShort == 9 as short
-
+
byte xByte = 032
assert xByte == 26 as byte
long xLong = 0246
assert xLong == 166l
-
+
BigInteger xBigInteger = 01111
assert xBigInteger == 585g
-
+
int xNegativeInt = -077
assert xNegativeInt == -63
// end::octal_literal_example[]
@@ -49,16 +49,16 @@ class SyntaxTest extends CompilableTestSupport {
short xShort = 0xaa
assert xShort == 170 as short
-
+
byte xByte = 0x3a
assert xByte == 58 as byte
long xLong = 0xffff
assert xLong == 65535l
-
+
BigInteger xBigInteger = 0xaaaa
assert xBigInteger == 43690g
-
+
Double xDouble = new Double('0x1.0p0')
assert xDouble == 1.0d
@@ -74,13 +74,13 @@ class SyntaxTest extends CompilableTestSupport {
short xShort = 0b11001001
assert xShort == 201 as short
-
+
byte xByte = 0b11
assert xByte == 3 as byte
long xLong = 0b101101101101
assert xLong == 2925l
-
+
BigInteger xBigInteger = 0b111100100001
assert xBigInteger == 3873g
diff --git a/src/spec/test/builder/FileTreeBuilderTest.groovy b/src/spec/test/builder/FileTreeBuilderTest.groovy
index 9910967..83b29a9 100644
--- a/src/spec/test/builder/FileTreeBuilderTest.groovy
+++ b/src/spec/test/builder/FileTreeBuilderTest.groovy
@@ -44,13 +44,13 @@ class FileTreeBuilderTest extends GroovyTestCase {
}
}
// end::example[]
-
+
// tag::example_assert[]
assert new File(tmpDir, '/src/main/groovy/Foo.groovy').text == 'println "Hello"'
assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends groovy.test.GroovyTestCase {}'
// end::example_assert[]
}
-
+
void testFileTreeBuilderShortHandSyntax() {
// tag::shorthand_syntax[]
tmpDir = File.createTempDir()
@@ -68,7 +68,7 @@ class FileTreeBuilderTest extends GroovyTestCase {
}
}
// end::shorthand_syntax[]
-
+
// tag::shorthand_syntax_assert[]
assert new File(tmpDir, '/src/main/groovy/Foo.groovy').text == 'println "Hello"'
assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends groovy.test.GroovyTestCase {}'
diff --git a/src/spec/test/builder/NodeBuilderTest.groovy b/src/spec/test/builder/NodeBuilderTest.groovy
index bcc814d..9871e1e 100644
--- a/src/spec/test/builder/NodeBuilderTest.groovy
+++ b/src/spec/test/builder/NodeBuilderTest.groovy
@@ -33,7 +33,7 @@ class NodeBuilderTest extends GroovyTestCase {
user(id: '2', firstname: 'Alice', lastname: 'Doe')
}
// end::node_builder_example[]
-
+
// tag::node_builder_gpath_assert[]
assert userlist.user.@firstname.join(', ') == 'John, Alice'
assert userlist.user.find { it.@lastname == 'Smith' }.address.size() == 2
diff --git a/src/spec/test/gdk/WorkingWithCollectionsTest.groovy b/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
index 46d8c74..16669c8 100644
--- a/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
+++ b/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
@@ -246,7 +246,7 @@ class WorkingWithCollectionsTest extends GroovyTestCase {
assert list == ['a','b','d','e','f','b','b','a']
// end::list_gdk_remove_index[]
'''
-
+
assertScript '''
// tag::list_gdk4[]
def list = [1,2,3,4,5,6,2,2,1]
diff --git a/src/spec/test/metaprogramming/GroovyObjectTest.groovy b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
index 29f73b2..b00dbf8 100644
--- a/src/spec/test/metaprogramming/GroovyObjectTest.groovy
+++ b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
@@ -29,7 +29,7 @@ class SomeGroovyClass {
def invokeMethod(String name, Object args) {
return "called invokeMethod $name $args"
}
-
+
def test() {
return 'method exists'
}
@@ -42,7 +42,7 @@ assert someGroovyClass.someMethod() == 'called invokeMethod someMethod []'
// end::groovy_invoke_method[]
'''
}
-
+
void testGetProperty () {
assertScript '''
// tag::groovy_get_property[]
@@ -51,11 +51,11 @@ class SomeGroovyClass {
def property1 = 'ha'
def field2 = 'ho'
def field4 = 'hu'
-
+
def getField1() {
return 'getHa'
}
-
+
def getProperty(String name) {
if (name != 'field3')
return metaClass.getProperty(this, name) // <1>
@@ -73,14 +73,14 @@ assert someGroovyClass.field4 == 'hu'
// end::groovy_get_property[]
'''
}
-
+
void testSetProperty () {
assertScript '''
// tag::groovy_set_property[]
class POGO {
String property
-
+
void setProperty(String name, Object value) {
this.@"$name" = 'overridden'
}
@@ -101,7 +101,7 @@ class SomeGroovyClass {
def field1 = 'ha'
def field2 = 'ho'
-
+
def getField1() {
return 'getHa'
}
@@ -114,7 +114,7 @@ assert someGroovyClass.metaClass.getAttribute(someGroovyClass, 'field2') == 'ho'
// end::groovy_get_attribute[]
'''
}
-
+
void testSetAttribute () {
assertScript '''
// tag::groovy_set_attribute[]
@@ -122,7 +122,7 @@ class POGO {
private String field
String property1
-
+
void setProperty1(String property1) {
this.property1 = "setProperty1"
}
diff --git a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
index 8764a92..ba5872f 100644
--- a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
+++ b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
@@ -29,7 +29,7 @@ class InterceptionThroughMetaClassTest extends GroovyTestCase {
invoking.metaClass.invokeMethod = { String name, Object args ->
'invoked'
}
-
+
assert invoking.length() == 'invoked'
assert invoking.someMethod() == 'invoked'
}
@@ -39,7 +39,7 @@ class InterceptionThroughMetaClassTest extends GroovyTestCase {
entity.metaClass.invokeMethod = { String name, Object args ->
'invoked'
}
-
+
assert entity.build(new Object()) == 'invoked'
assert entity.someMethod() == 'invoked'
}
diff --git a/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy b/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
index c03aeb4..663a8bf 100644
--- a/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
+++ b/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
@@ -26,7 +26,7 @@ class MethodPropertyMissingTest extends GroovyTestCase {
assertScript '''
//tag::method_missing_simple[]
class Foo {
-
+
def methodMissing(String name, def args) {
return "this is me"
}
diff --git a/src/spec/test/semantics/OptionalityTest.groovy b/src/spec/test/semantics/OptionalityTest.groovy
index abc7259..4cc760a 100644
--- a/src/spec/test/semantics/OptionalityTest.groovy
+++ b/src/spec/test/semantics/OptionalityTest.groovy
@@ -28,30 +28,30 @@ class OptionalityTest extends CompilableTestSupport {
def maximum = Math.max 5, 10
// end::optional_parentheses[]
}
-
+
void testRequiredParentheses() {
// tag::required_parentheses[]
println()
println(Math.max(5, 10))
// end::required_parentheses[]
}
-
+
void testOptionalSemicolons() {
// tag::single_statement_with_semicolon[]
assert true;
// end::single_statement_with_semicolon[]
-
+
// tag::single_statement_without_semicolon[]
assert true
// end::single_statement_without_semicolon[]
}
-
+
void testRequiredSemicolons() {
// tag::statements_separated_by_semicolon[]
boolean a = true; assert a
// end::statements_separated_by_semicolon[]
}
-
+
void testOptionalReturn() {
assertScript '''
// tag::return_keyword[]
@@ -70,7 +70,7 @@ class OptionalityTest extends CompilableTestSupport {
// end::omitted_return_keyword[]
'''
}
-
+
void testOptionalPublic() {
shouldCompile '''
// tag::public_keyword[]
diff --git a/src/spec/test/semantics/TheGroovyTruthTest.groovy b/src/spec/test/semantics/TheGroovyTruthTest.groovy
index eb2791c..a9cdcd3 100644
--- a/src/spec/test/semantics/TheGroovyTruthTest.groovy
+++ b/src/spec/test/semantics/TheGroovyTruthTest.groovy
@@ -27,17 +27,17 @@ class TheGroovyTruthTest extends GroovyTestCase {
assert true
assert !false
// end::boolean_truth[]
-
+
// tag::matcher_truth[]
assert ('a' =~ /a/)
assert !('a' =~ /b/)
// end::matcher_truth[]
-
+
// tag::collection_truth[]
assert [1, 2, 3]
assert ![]
// end::collection_truth[]
-
+
// tag::iterator_enumeration_truth[]
assert [0].iterator()
assert ![].iterator()
@@ -47,12 +47,12 @@ class TheGroovyTruthTest extends GroovyTestCase {
enumeration.nextElement()
assert !enumeration
// end::iterator_enumeration_truth[]
-
+
// tag::map_truth[]
assert ['one' : 1]
assert ![:]
// end::map_truth[]
-
+
// tag::string_truth[]
assert 'a'
assert !''
@@ -61,25 +61,25 @@ class TheGroovyTruthTest extends GroovyTestCase {
def empty = ''
assert !"$empty"
// end::string_truth[]
-
+
// tag::number_truth[]
assert 1
assert 3.5
assert !0
// end::number_truth[]
-
+
// tag::object_truth[]
assert new Object()
assert !null
// end::object_truth[]
}
-
+
void testAsBoolean() {
assertScript '''
// tag::asBoolean_object[]
class Color {
String name
-
+
boolean asBoolean(){
name == 'green' ? true : false
}
diff --git a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
index 602a6a1..56e19d3 100644
--- a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
+++ b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
@@ -465,13 +465,13 @@ class AClass {
}
def x = "owner"
-
+
def test() {
def theDelegate = new ADelegate()
def res = closureExecuter(theDelegate) {
return x
}
-
+
return res
}
}
@@ -497,13 +497,13 @@ class AClass {
}
def x = "owner"
-
+
def test() {
def theDelegate = new ADelegate()
def res = closureExecuter(theDelegate) {
x = "changed"
}
-
+
return [theDelegate.x, this.x].toSet()
}
}
diff --git a/src/tck/test/gls/ch03/s01/Unicode1.groovy b/src/tck/test/gls/ch03/s01/Unicode1.groovy
index 60ebbab..c8e9234 100644
--- a/src/tck/test/gls/ch03/s01/Unicode1.groovy
+++ b/src/tck/test/gls/ch03/s01/Unicode1.groovy
@@ -21,7 +21,7 @@ package gls.ch03.s01
import groovy.test.GroovyTestCase
/**
- * Except for comments, identifiers and the contents of ... string
+ * Except for comments, identifiers and the contents of ... string
* literals, all input elements are formed from ASCII characters.
*
* TODO: Find a better way to test these things
@@ -53,7 +53,7 @@ class Unicode1 extends GroovyTestCase {
char b = "x"
def c = "x".charAt(0)
assert a == b
- assert a == c
+ assert a == c
}
}
diff --git a/src/tck/test/gls/ch03/s01/Unicode2.groovy b/src/tck/test/gls/ch03/s01/Unicode2.groovy
index 3baff7a..6fb1e58 100644
--- a/src/tck/test/gls/ch03/s01/Unicode2.groovy
+++ b/src/tck/test/gls/ch03/s01/Unicode2.groovy
@@ -21,7 +21,7 @@ package gls.ch03.s01
import groovy.test.GroovyTestCase
/**
- * Except for comments, identifiers and the contents of ... string
+ * Except for comments, identifiers and the contents of ... string
* literals, all input elements are formed from ASCII characters.
*/
class Unicode2 extends GroovyTestCase {
diff --git a/src/tck/test/gls/ch03/s02/Longest1.groovy b/src/tck/test/gls/ch03/s02/Longest1.groovy
index 5e4c986..70d628b 100644
--- a/src/tck/test/gls/ch03/s02/Longest1.groovy
+++ b/src/tck/test/gls/ch03/s02/Longest1.groovy
@@ -21,10 +21,10 @@ package gls.ch03.s02
import groovy.test.GroovyTestCase
/**
- * GLS 3.2: The longest possible translation is used at each step, even if the
- * result does not ultimately make a correct program while another lexical
+ * GLS 3.2: The longest possible translation is used at each step, even if the
+ * result does not ultimately make a correct program while another lexical
* translation would.
- *
+ *
* This is fundamental to the way the lexer works. If there is a problem with
* it, other tests (e.g. to test functionality of operators or identifier
* names) would expose it quickly. Nevertheless, we test some combinations
@@ -37,7 +37,7 @@ class Longest1 extends GroovyTestCase {
def a = 20
def b = 10
def c = a - b
- //c = a -- b // @fail:parse
+ //c = a -- b // @fail:parse
//c = a ++ b // @fail:parse
//c = a +- b // @pass
//c = a -+ b // @pass
diff --git a/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
index 3024bf5..d3fb348 100644
--- a/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
+++ b/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
@@ -22,10 +22,10 @@ import groovy.test.GroovyTestCase
/**
* GLS 3.3:
- * Implementations first recognize Unicode escapes in their input, translating
+ * Implementations first recognize Unicode escapes in their input, translating
* the ASCII characters backslash and 'u' followed by four hexadecimal digits
* to the Unicode character with the indicated hexadecimal value, and passing
- * all other characters unchanged.
+ * all other characters unchanged.
*/
class UnicodeEscapes1 extends GroovyTestCase {
@@ -51,7 +51,7 @@ class UnicodeEscapes1 extends GroovyTestCase {
void testOtherVariations() {
// Capital 'U' not allowed
- // assert "\U0061" == "a" // @fail:parse
+ // assert "\U0061" == "a" // @fail:parse
}
// todo: Implementations should use the \ uxxxx notation as an output format to
@@ -59,7 +59,7 @@ class UnicodeEscapes1 extends GroovyTestCase {
// (to be tested as part of the standard library)
// todo: Representing supplementary characters requires two consecutive Unicode
- // escapes.
+ // escapes.
// (not sure how to test)
// see: gls.ch03.s01.Unicode2.testUTF16SupplementaryCharacters()
diff --git a/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
index 55cd53e..4bf41c0 100644
--- a/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
+++ b/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
@@ -22,20 +22,20 @@ import groovy.test.GroovyTestCase
/**
* GLS 3.3:
- * Implementations first recognize Unicode escapes in their input, translating
+ * Implementations first recognize Unicode escapes in their input, translating
* the ASCII characters backslash and 'u' followed by four hexadecimal digits
* to the Unicode character with the indicated hexadecimal value, and passing
- * all other characters unchanged.
+ * all other characters unchanged.
*/
class UnicodeEscapes2 extends GroovyTestCase {
- // GLS: If an even number of backslashes precede the 'u', it is not
+ // GLS: If an even number of backslashes precede the 'u', it is not
// an escape
/*
void testCountBackslash() {
def a = 1
assert \u0061 == 1 // char 61 is 'a'
-
+
// Not intepreted as an escape
// \\u0061 == 1 // @fail:parse
@@ -43,7 +43,7 @@ class UnicodeEscapes2 extends GroovyTestCase {
// Double backslash interpreted as a single backslash in string
assert "\\u0061".length() == 6
assert "\\\u0061".length() == 2
-
+
}
*/
@@ -58,9 +58,9 @@ class UnicodeEscapes2 extends GroovyTestCase {
// Subsequent lines won't work. The backslash has been replaced by a forward slash
// so that the file parses. (Comments don't comment out unicode escapes.)
- // assert "/u7" == "\07" //@fail:parse
- // def /u61 = 2 //@fail:parse
- // def /u061 = 2 //@fail:parse
+ // assert "/u7" == "\07" //@fail:parse
+ // def /u61 = 2 //@fail:parse
+ // def /u061 = 2 //@fail:parse
}
*/
diff --git a/src/test-resources/bugs/BUG-GROOVY-8426.groovy b/src/test-resources/bugs/BUG-GROOVY-8426.groovy
index 917e8cb..79a3691 100644
--- a/src/test-resources/bugs/BUG-GROOVY-8426.groovy
+++ b/src/test-resources/bugs/BUG-GROOVY-8426.groovy
@@ -31,7 +31,7 @@ class Groovy8426Test {
def result = new AstBuilder().buildFromString CONVERSION, false, '''
def method() {
'return value'
-
+
}
'''
diff --git a/src/test-resources/core/Command_04.groovy b/src/test-resources/core/Command_04.groovy
index ba3b2c3..5c476c5 100644
--- a/src/test-resources/core/Command_04.groovy
+++ b/src/test-resources/core/Command_04.groovy
@@ -22,4 +22,3 @@ promise = promise.then { it * 2 } then { it * 3 } then { it + 6 } 'someProperty'
promise = promise.then { it * 2 } then { it * 3 } then { it + 6 } "someProperty"
promise = promise.then { it * 2 } then { it * 3 } then { it + 6 } "somePropert${'y'}"
result = [1, 2, 3].size().plus 1 plus 2
-
diff --git a/src/test-resources/core/List_01.groovy b/src/test-resources/core/List_01.groovy
index f7c122e..a78d2f8 100644
--- a/src/test-resources/core/List_01.groovy
+++ b/src/test-resources/core/List_01.groovy
@@ -18,7 +18,7 @@
*/
[]
[
-
+
]
[1, 2, 3]
[1, 2, 3,]
diff --git a/src/test/gls/annotations/AnnotationTest.groovy b/src/test/gls/annotations/AnnotationTest.groovy
index 6122a1c..e815a39 100644
--- a/src/test/gls/annotations/AnnotationTest.groovy
+++ b/src/test/gls/annotations/AnnotationTest.groovy
@@ -535,13 +535,13 @@ final class AnnotationTest extends CompilableTestSupport {
scriptStr = """
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
-
+
@Retention(RetentionPolicy.RUNTIME)
@interface Annot3454V2 {
String x() default 'xxx'
String y()
}
-
+
@Annot3454V2
class Bar {}
"""
@@ -552,16 +552,16 @@ final class AnnotationTest extends CompilableTestSupport {
scriptStr = """
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
-
+
@Retention(RetentionPolicy.RUNTIME)
@interface Annot3454V3 {
String x() default 'xxx'
String y()
}
-
+
@Annot3454V3(y = 'yyy')
class Bar {}
-
+
def anno = Bar.class.getAnnotation(Annot3454V3)
assert anno.x() == 'xxx'
assert anno.y() == 'yyy'
@@ -652,7 +652,7 @@ final class AnnotationTest extends CompilableTestSupport {
void testAnnotationOnEnumConstant() {
assertScript '''import gls.annotations.XmlEnum
import gls.annotations.XmlEnumValue
-
+
@XmlEnum
enum GroovyEnum {
@XmlEnumValue("good")
@@ -868,7 +868,7 @@ final class AnnotationTest extends CompilableTestSupport {
@ConstAnnotation(ints = 42)
class Child1 extends Base3278 {}
-
+
class OtherConstants {
static final Integer CONST3 = 3278
}
diff --git a/src/test/gls/annotations/AnnotationsInfoTest.groovy b/src/test/gls/annotations/AnnotationsInfoTest.groovy
index f78023d..57bce92 100644
--- a/src/test/gls/annotations/AnnotationsInfoTest.groovy
+++ b/src/test/gls/annotations/AnnotationsInfoTest.groovy
@@ -28,13 +28,13 @@ class AnnotationsInfoTest extends AnnotationsTestBase {
class B extends ArrayList<Long> {
@HasSourceRetention
def fieldS
-
+
@HasRuntimeRetention
def fieldR
-
+
@HasDefaultClassRetention
def methodDC() {}
-
+
@HasExplicitClassRetention
def methodEC() {}
}
diff --git a/src/test/gls/annotations/closures/AnnotationClosureTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
index d54befd..0f86caf 100644
--- a/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
+++ b/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
@@ -29,7 +29,7 @@ class AnnotationClosureTest extends CompilableTestSupport {
def answer = new Object() {
def answer() { 42 }
}
-
+
void testGep3InClosure() {
shouldCompile """
@interface Bar{Class value();}
@@ -153,7 +153,7 @@ import java.lang.annotation.*
class Foo {}
"""
}
-
+
@NotYetImplemented
void testAnnotationOnAnonymousMethod() {
shouldCompile """
diff --git a/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy b/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
index c998caf..7f39b3f 100644
--- a/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
+++ b/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
@@ -21,16 +21,16 @@ package gls.annotations.closures
import groovy.test.GroovyTestCase
class AnnotationClosureWithNonLocalVariable extends GroovyTestCase {
-
+
void testVanillaVariable() {
assertScript """
import java.lang.annotation.*
-
+
@Retention(RetentionPolicy.RUNTIME)
@interface Foo {
Class value()
}
-
+
class X {
@Foo({ value })
def doit(value) {}
diff --git a/src/test/gls/ch06/s05/GName1Test.groovy b/src/test/gls/ch06/s05/GName1Test.groovy
index 6f4dfbc..7a5c9d0 100644
--- a/src/test/gls/ch06/s05/GName1Test.groovy
+++ b/src/test/gls/ch06/s05/GName1Test.groovy
@@ -32,132 +32,132 @@ class GName1Test extends GroovyTestCase {
def newX = "new x"
def newX1 = "new x1"
def newX2 = "new x2"
-
+
assert obj.x == "property"
assert obj.@x == "field"
assert obj.x() == "method"
-
+
obj.x = newX
obj.@x = newX1
-
+
assert obj.x == newX
assert obj.@x == newX1
-
+
obj.setX newX2
-
+
assert obj.x == newX2
assert obj.@x == newX1
}
-
+
void testObjectSupportNameHandling1() {
Tt1go obj = new Tt1go() // Test class subclassing GroovyObjectSupport
def newX = "new x"
def newX1 = "new x1"
def newX2 = "new x2"
-
+
assert obj.x == "property"
assert obj.@x == "field"
assert obj.x() == "method"
-
+
obj.x = newX
obj.@x = newX1
-
+
assert obj.x == newX
assert obj.@x == newX1
-
+
obj.setX newX2
-
+
assert obj.x == newX2
assert obj.@x == newX1
}
-
+
void testObjectSupportNameHandling2() {
Tt1 obj = new Tt1gi() // Test POJO implementing GroovyObject
def newX = "new x"
def newX1 = "new x1"
def newX2 = "new x2"
-
+
assert obj.x == "dynamic property"
assert obj.@x == "field"
assert obj.x() == "dynamic method"
-
+
obj.x = newX
obj.@x = newX1
-
+
assert obj.x == "dynamic property"
assert obj.@x == newX1
-
+
obj.setX newX2
-
+
assert obj.x == "dynamic property"
assert obj.@x == newX1
}
-
+
void testObjectSupportNameHandlingWitnClosureValues() {
Tt1c obj = new Tt1c() // Test POJO
def newX = {"new x"}
def newX1 = {"new x1"}
def newX2 = {"new x2"}
-
+
assert (obj.x)() == "property"
assert obj.@x() == "field"
assert obj.x() == "method"
-
-
+
+
obj.x = newX
obj.@x = newX1
-
+
assert (obj.x)() == newX()
assert obj.@x() == newX1()
-
+
obj.setX newX2
-
+
assert (obj.x)() == newX2()
assert obj.@x() == newX1()
}
-
+
void testObjectSupportNameHandlingWitnClosureValues1() {
Tt1cgo obj = new Tt1cgo() // class subclassing GroovyObjectSupport
def newX = {"new x"}
def newX1 = {"new x1"}
def newX2 = {"new x2"}
-
+
assert (obj.x)() == "property"
assert obj.@x() == "field"
assert obj.x() == "method"
-
-
+
+
obj.x = newX
obj.@x = newX1
-
+
assert (obj.x)() == newX()
assert (obj.@x)() == newX1()
-
+
obj.setX newX2
-
+
assert (obj.x)() == newX2()
assert (obj.@x)() == newX1()
}
-
+
void testObjectSupportNameHandlingWitnClosureValues2() {
Tt1c obj = new Tt1cgi() // Test POJO implementing GroovyObject
def newX = {"new x"}
def newX1 = {"new x1"}
def newX2 = {"new x2"}
-
+
assert (obj.x)() == "property"
assert (obj.@x)() == "field" // can't write obj.@x() - syntax error
assert obj.x() == "method"
-
-
+
+
obj.x = newX
obj.@x = newX1
-
+
assert (obj.x)() == newX()
assert (obj.@x)() == newX1()
-
+
obj.setX newX2
-
+
assert (obj.x)() == newX2()
assert (obj.@x)() == newX1()
}
diff --git a/src/test/gls/generics/GenericsBytecodeTest.groovy b/src/test/gls/generics/GenericsBytecodeTest.groovy
index 897149c..3c636c8 100644
--- a/src/test/gls/generics/GenericsBytecodeTest.groovy
+++ b/src/test/gls/generics/GenericsBytecodeTest.groovy
@@ -210,7 +210,7 @@ class GenericsBytecodeTest extends GenericsTestBase {
class B<T> {
private T owner;
Class<T> getOwnerClass(){}
-
+
}
"""
assert signatures == [
diff --git a/src/test/gls/invocation/ClosureDelegationTest.groovy b/src/test/gls/invocation/ClosureDelegationTest.groovy
index 44ae109..c22479d 100644
--- a/src/test/gls/invocation/ClosureDelegationTest.groovy
+++ b/src/test/gls/invocation/ClosureDelegationTest.groovy
@@ -63,7 +63,7 @@ assert closure() == "A"
assert visited==true
"""
}
-
+
void testMissingMethodInvokeMethod() {
assertScript """
class A {
@@ -84,7 +84,7 @@ assert closure() == "A"
assert visited==true
"""
}
-
+
void testInvokeMethodInvokeMethod() {
assertScript """
class A {
diff --git a/src/test/gls/invocation/CovariantReturnTest.groovy b/src/test/gls/invocation/CovariantReturnTest.groovy
index 1af5daa..8e136aa 100644
--- a/src/test/gls/invocation/CovariantReturnTest.groovy
+++ b/src/test/gls/invocation/CovariantReturnTest.groovy
@@ -262,7 +262,7 @@ class CovariantReturnTest extends CompilableTestSupport {
}
"""
}
-
+
void testPrimitiveObjectMix() {
//Object overridden by primitive
shouldNotCompile """
@@ -317,14 +317,14 @@ class CovariantReturnTest extends CompilableTestSupport {
interface Interface<SomeType> {
public int handle(long a, SomeType x);
}
-
+
class InterfaceImpl
implements Interface<String> {
public int handle(long a, String something) {
return 1
}
}
-
+
InterfaceImpl test = new InterfaceImpl()
assert test.handle(5, "hi") == 1
"""
diff --git a/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy b/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
index 1d6e998..f10cdd4 100644
--- a/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
+++ b/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
@@ -39,7 +39,7 @@ class GroovyObjectInheritanceTest extends CompilableTestSupport {
assert bar.foo==1
"""
}
-
+
void testInheritanceWithSetProperty() {
assertScript """
class Foo {
@@ -62,7 +62,7 @@ class GroovyObjectInheritanceTest extends CompilableTestSupport {
assert bar.foo == 1
"""
}
-
+
void testInheritanceWithInvokeMethod() {
assertScript """
class Foo {
@@ -81,7 +81,7 @@ class GroovyObjectInheritanceTest extends CompilableTestSupport {
assert bar.foo() == 1
"""
}
-
+
void testMetaClassFieldInheritance() {
assertScript """
class Foo {}
@@ -90,27 +90,27 @@ class GroovyObjectInheritanceTest extends CompilableTestSupport {
assert Bar.class.declaredFields.find{it.name=="metaClass"}==null
"""
}
-
+
void testStandardInheritance() {
assertScript """
class Foo{}
class Bar extends Foo{}
-
+
assert Foo.class.declaredFields.find{it.name=="metaClass"}!=null
assert Bar.class.declaredFields.find{it.name=="metaClass"}==null
-
+
assert Foo.class.declaredMethods.find{it.name=="getMetaClass"}!=null
assert Bar.class.declaredMethods.find{it.name=="getMetaClass"}==null
-
+
assert Foo.class.declaredMethods.find{it.name=="setMetaClass"}!=null
assert Bar.class.declaredMethods.find{it.name=="setMetaClass"}==null
-
+
assert Foo.class.declaredMethods.find{it.name=="getProperty"}==null
assert Bar.class.declaredMethods.find{it.name=="getProperty"}==null
-
+
assert Foo.class.declaredMethods.find{it.name=="setProperty"}==null
assert Bar.class.declaredMethods.find{it.name=="setProperty"}==null
-
+
assert Foo.class.declaredMethods.find{it.name=="invokeMethod"}==null
assert Bar.class.declaredMethods.find{it.name=="invokeMethod"}==null
"""
diff --git a/src/test/gls/invocation/MethodSelectionTest.groovy b/src/test/gls/invocation/MethodSelectionTest.groovy
index 361cdf3..97379c9 100644
--- a/src/test/gls/invocation/MethodSelectionTest.groovy
+++ b/src/test/gls/invocation/MethodSelectionTest.groovy
@@ -41,7 +41,7 @@ class MethodSelectionTest extends CompilableTestSupport {
assert m(new C()) == 2
assert m(new E()) == 2
"""
-
+
assertScript """
class A implements I1 {}
class B extends A implements I2 {}
@@ -60,7 +60,7 @@ class MethodSelectionTest extends CompilableTestSupport {
assert foo(new C())==3
"""
}
-
+
void testMostGeneralForNull() {
// we use the same signatures with different method orders,
// because we want to catch method ordering bugs
@@ -68,17 +68,17 @@ class MethodSelectionTest extends CompilableTestSupport {
def m(String x){1}
def m(Integer x){2}
assert m(null) == 1
-
+
def n(Integer x){2}
def n(String x){1}
assert n(null) == 1
"""
-
+
// Exception defines Throwable and String versions, which are both equal
shouldFail """
new Exception(null)
"""
-
+
shouldFail """
class A {
public A(String a){}
@@ -87,7 +87,7 @@ class MethodSelectionTest extends CompilableTestSupport {
}
new A()
"""
-
+
shouldFail """
class A{}
class B{}
@@ -102,14 +102,14 @@ class MethodSelectionTest extends CompilableTestSupport {
new A()
"""
}
-
+
void testMethodSelectionException() {
assertScript """
import org.codehaus.groovy.runtime.metaclass.MethodSelectionException as MSE
-
+
def foo(int x) {}
def foo(Number x) {}
-
+
try {
foo()
assert false
@@ -118,7 +118,7 @@ class MethodSelectionTest extends CompilableTestSupport {
assert mse.message.indexOf("#foo(int)") >0
assert mse.message.indexOf("#foo(java.lang.Number)") >0
}
-
+
"""
}
@@ -210,12 +210,12 @@ class MethodSelectionTest extends CompilableTestSupport {
assert Mark.log == "BazApplication.onRequestStart(PortletRequest, PortletResponse)FooApplication.onRequestStart(PortletRequest, PortletResponse)"
"""
}
-
+
void testNullUsageForPrimitivesWithExplicitNull() {
[byte,int,short,float,double,boolean,char].each { type ->
assertScript """
def foo($type x) {}
-
+
boolean catched = false
try {
foo(null)
@@ -228,12 +228,12 @@ class MethodSelectionTest extends CompilableTestSupport {
"""
}
}
-
+
void testNullUsageForPrimitivesWithImplicitNull() {
[byte,int,short,float,double,boolean,char].each { type ->
assertScript """
def foo($type x) {}
-
+
boolean catched = false
try {
foo()
@@ -246,19 +246,19 @@ class MethodSelectionTest extends CompilableTestSupport {
"""
}
}
-
+
void testNullUsageForPrimitivesAndOverloading() {
[byte,int,short,float,double].each { type ->
assertScript """
def foo(String x){1}
def foo($type x) {2}
-
+
def txt = "foo($type) was called where foo(String) should have been called"
assert foo(null)==1, txt
"""
}
}
-
+
void testPrivateMethodSelectionFromClosure(){
assertScript """
class I1 {
@@ -273,10 +273,10 @@ class MethodSelectionTest extends CompilableTestSupport {
}
def i = new I2()
assert i.bar()() == 1
-
+
"""
}
-
+
void testCachingForNullAndPrimitive(){
assertScript """
boolean shaky(boolean defaultValue) {false}
@@ -289,7 +289,7 @@ class MethodSelectionTest extends CompilableTestSupport {
}
"""
}
-
+
void testSpreadOperatorAndVarargs(){
assertScript """
class SpreadBug {
@@ -302,64 +302,64 @@ class MethodSelectionTest extends CompilableTestSupport {
assert sb.foo("1","42")==2
"""
}
-
+
void testBDandBIToFloatAutoConversionInMethodSelection() {
def foo = new Foo3977()
-
+
// double examples were working already but float ones were not
// adding both here just to make sure the inconsistency doesn't creep in again
foo.setMyDouble1 1.0
assert foo.getMyDouble1() == 1.0
-
+
foo.setMyDouble1 new BigInteger('1')
assert foo.getMyDouble1() == 1.0
foo.setMyDouble2 1.0
assert foo.getMyDouble2() == 1.0
-
+
foo.setMyDouble2 new BigInteger('1')
assert foo.getMyDouble2() == 1.0
foo.setMyFloat1 1.0
assert foo.getMyFloat1() == 1.0
-
+
foo.setMyFloat1 new BigInteger('1')
assert foo.getMyFloat1() == 1.0
foo.setMyFloat2 1.0
assert foo.getMyFloat2() == 1.0
-
+
foo.setMyFloat2 new BigInteger('1')
assert foo.getMyFloat2() == 1.0
}
-
+
void testCallWithExendedBigDecimal() {
assertScript """
BigDecimal f (BigDecimal x) {
return x
}
-
+
public class ExtendedBigDecimal extends java.math.BigDecimal {
public ExtendedBigDecimal (int i) {
super (i)
}
}
-
+
assert f(new ExtendedBigDecimal(1)) == 1
"""
}
-
+
void testVargsClass() {
assertScript """
interface Parent {}
interface Child extends Parent {}
-
+
class Child1 implements Child { }
def a = new Child1()
-
+
class Child2 implements Child { }
def b = new Child2()
-
+
def foo(Parent... values) {
assert values.class == Parent[]
}
@@ -373,7 +373,7 @@ class MethodSelectionTest extends CompilableTestSupport {
private String[] getStringArrayDirectly() { ["string_00", "string_01"] }
private String[] getStringArrayIndirectlyWithType(String[] stringarray) { stringarray }
private String[] getStringArrayIndirectlyWithoutType(stringarray) { stringarray }
-
+
public int getStringArrayDirectly_Length() { getStringArrayDirectly().length }
public int getStringArrayIndirectlyWithType_Length() { getStringArrayIndirectlyWithType(getStringArrayDirectly()).length }
public int getStringArrayIndirectlyWithoutType_Length() { getStringArrayIndirectlyWithoutType(getStringArrayDirectly()).length }
@@ -383,7 +383,7 @@ class MethodSelectionTest extends CompilableTestSupport {
assert getStringArrayIndirectlyWithType_Length() == getStringArrayIndirectlyWithoutType_Length()
"""
}
-
+
// GROOVY-6189, GROOVY-9852
void testSAMs() {
// simple direct case
@@ -418,7 +418,7 @@ class MethodSelectionTest extends CompilableTestSupport {
"""
}
}
-
+
// GROOVY-6431
void testBigDecAndBigIntSubClass() {
assertScript'''
diff --git a/src/test/gls/invocation/StaticMethodInvocationTest.groovy b/src/test/gls/invocation/StaticMethodInvocationTest.groovy
index 01cce85..3b7acbb 100644
--- a/src/test/gls/invocation/StaticMethodInvocationTest.groovy
+++ b/src/test/gls/invocation/StaticMethodInvocationTest.groovy
@@ -28,14 +28,14 @@ class StaticMethodInvocationTest extends CompilableTestSupport {
class Test {
// all errors go away if method is declared non-private
private static foo() {}
-
+
static callFooFromStaticMethod() {
Test.foo()
foo()
this.foo()
new Test().foo()
}
-
+
def callFooFromInstanceMethod() {
Test.foo()
foo()
@@ -48,14 +48,14 @@ Test.callFooFromStaticMethod()
new Test().callFooFromInstanceMethod()
"""
}
-
+
//GROOVY-6662
void testStaticMethodNotWronglyCached() {
assertScript '''
class A { static bar() {1} }
class B { static bar() {2} }
static foo(Class c) { c.bar() }
-
+
assert foo(A) == 1
assert foo(B) == 2
'''
diff --git a/src/test/gls/scope/NameResolvingTest.groovy b/src/test/gls/scope/NameResolvingTest.groovy
index 41c2be0..6cf0206 100644
--- a/src/test/gls/scope/NameResolvingTest.groovy
+++ b/src/test/gls/scope/NameResolvingTest.groovy
@@ -63,13 +63,13 @@ class NameResolvingTest extends CompilableTestSupport {
}
"""
}
-
+
void testSuperClassVariableAccess() {
assertScript """
class U {
public static final int uint
}
-
+
class A extends U {
def foo ( ) {
id "A" + ( ( uint < 7 ) ? "B" : "C" ) + '\\n'
diff --git a/src/test/gls/scope/StaticScopeTest.groovy b/src/test/gls/scope/StaticScopeTest.groovy
index d7a016a..016425d 100644
--- a/src/test/gls/scope/StaticScopeTest.groovy
+++ b/src/test/gls/scope/StaticScopeTest.groovy
@@ -220,7 +220,7 @@ class StaticScopeTest extends CompilableTestSupport {
}
"""
}
-
+
void testStaticMethodAccessingDynamicField() {
shouldFail MissingMethodException, """
class A {
@@ -230,20 +230,20 @@ class StaticScopeTest extends CompilableTestSupport {
A.foo()
"""
}
-
+
void testStaticThisWithClass() {
assertScript """
static foo(){this}
assert foo() instanceof Class
assert foo() != Class
"""
-
+
assertScript """
static foo(){this.class}
assert foo() == Class
"""
}
-
+
void testConstructorParameterDefault() {
shouldNotCompile """
class Child {
diff --git a/src/test/gls/sizelimits/StringSizeTest.groovy b/src/test/gls/sizelimits/StringSizeTest.groovy
index 7ac7182..307976d 100644
--- a/src/test/gls/sizelimits/StringSizeTest.groovy
+++ b/src/test/gls/sizelimits/StringSizeTest.groovy
@@ -19,24 +19,24 @@
package gls.sizelimits
class StringSizeTest extends gls.CompilableTestSupport {
-
+
void testNormalString() {
def string = "x"*65535
-
+
assertScript """
def test="$string"
"""
-
+
shouldNotCompile """
def test="x $string"
"""
}
-
+
void testGString() {
def string = "x"*65534
// not 65535, because we use one additional space
// in the gstring test script
-
+
assertScript """
def x = 1
def test = "\$x $string"
diff --git a/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy b/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
index 41d0fa3..c253b89 100644
--- a/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
+++ b/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
@@ -29,14 +29,14 @@ class MultipleAssignmentDeclarationTest extends CompilableTestSupport {
assert b==2
"""
}
-
+
void testDefWithoutLiteral() {
def list = [1, 2]
def (c, d) = list
assert c==1
assert d==2
}
-
+
void testMixedTypes() {
assertScript """
def x = "foo"
@@ -48,7 +48,7 @@ class MultipleAssignmentDeclarationTest extends CompilableTestSupport {
assert j instanceof String
"""
}
-
+
void testMixedTypesWithConversion() {
assertScript '''
def x = "foo"
@@ -60,7 +60,7 @@ class MultipleAssignmentDeclarationTest extends CompilableTestSupport {
assert j instanceof String
'''
}
-
+
void testDeclarationOrder() {
assertScript """
try {
@@ -71,7 +71,7 @@ class MultipleAssignmentDeclarationTest extends CompilableTestSupport {
}
"""
}
-
+
void testNestedScope() {
assertScript """
def c = {
@@ -80,26 +80,26 @@ class MultipleAssignmentDeclarationTest extends CompilableTestSupport {
assert j==2
}
c()
-
+
try {
println i
assert false
} catch (MissingPropertyException mpe) {
assert true
}
-
+
try {
println j
assert false
} catch (MissingPropertyException mpe) {
assert true
}
-
+
def (i,j) = [2,3]
assert i==2
assert j==3
c()
-
+
assert i==2
assert j==3
"""
diff --git a/src/test/gls/statements/ReturnTest.groovy b/src/test/gls/statements/ReturnTest.groovy
index aa4bad4..66effd7 100644
--- a/src/test/gls/statements/ReturnTest.groovy
+++ b/src/test/gls/statements/ReturnTest.groovy
@@ -29,7 +29,7 @@ class ReturnTest extends CompilableTestSupport {
}
"""
}
-
+
void testStaticInitializer() {
assertScript """
class A {
diff --git a/src/test/gls/syntax/AssertTest.groovy b/src/test/gls/syntax/AssertTest.groovy
index bd10587..8b9e6de 100644
--- a/src/test/gls/syntax/AssertTest.groovy
+++ b/src/test/gls/syntax/AssertTest.groovy
@@ -19,7 +19,7 @@
package gls.syntax
class AssertTest extends gls.CompilableTestSupport {
-
+
void testAssignment() {
// don't allow "=" here, it most certainly must be a "=="
shouldNotCompile """
diff --git a/src/test/gls/syntax/Gep3Test.groovy b/src/test/gls/syntax/Gep3Test.groovy
index 2b100db..b24ce46 100644
--- a/src/test/gls/syntax/Gep3Test.groovy
+++ b/src/test/gls/syntax/Gep3Test.groovy
@@ -305,7 +305,7 @@ class Gep3Test extends GroovyTestCase {
assert resolved
}
-
+
/**
* Case where an Integer is used as name
*
@@ -343,7 +343,7 @@ class Gep3Test extends GroovyTestCase {
assert turned
}
-
+
// case task copy(type: Copy) { 10 }
// equivalent task(copy(type:Copy,{10}))
void testInnerMethodWithClosure() {
@@ -376,34 +376,34 @@ class Gep3Test extends GroovyTestCase {
task copy(type: Copy) { a 10 b 10 }
"""
}
-
+
void testGradleDSL() {
assertScript '''
def invokeMethod(String name, args) {
if (name ==~ "/c/.*") {
def namedArgs = args[0]
def closure = args[1]
-
+
assert namedArgs instanceof Map
assert namedArgs.controller == 'foo'
assert namedArgs.action == 'bar'
-
+
closure()
}
}
-
+
def constraints(Closure c) {
c.delegate = [authCode: { Map m -> println m }]
c.resolveStrategy = Closure.DELEGATE_FIRST
c()
}
-
+
def authCode(Map m) {
assert !m.blank
}
-
+
def val = 'xyz'
-
+
name xxx: "/c/$val"(controller: 'foo', action: 'bar') {
constraints {
authCode blank: false
@@ -411,7 +411,7 @@ class Gep3Test extends GroovyTestCase {
}
'''
}
-
+
void testUsageOfInnerClass() {
assertScript """
class Demo {
@@ -422,7 +422,7 @@ class Gep3Test extends GroovyTestCase {
}
}
}
-
+
void execute(arg) {
arg.run()
}
diff --git a/src/test/gls/syntax/ParsingTest.groovy b/src/test/gls/syntax/ParsingTest.groovy
index 9668623..6b4f617 100644
--- a/src/test/gls/syntax/ParsingTest.groovy
+++ b/src/test/gls/syntax/ParsingTest.groovy
@@ -27,7 +27,7 @@ class ParsingTest extends CompilableTestSupport {
shouldCompile """
(String) {-> print ""}.call()
"""
-
+
shouldCompile """
(String[]) {-> print ""}.call()
"""
@@ -35,7 +35,7 @@ class ParsingTest extends CompilableTestSupport {
shouldCompile """
(short) {-> print numbers[0]}.call()
"""
-
+
shouldCompile """
(short[]) {-> print numbers}.call()
"""
@@ -43,7 +43,7 @@ class ParsingTest extends CompilableTestSupport {
def val1 = (Groovy2605) {-> return testObj}.call()
assert val1 instanceof Groovy2605
-
+
def val2 = (String){-> return testObj}.call()
assert val2 instanceof String
assert val2 == "[A Groovy2605 object]"
diff --git a/src/test/gls/types/BooleanExpressionConversionTest.groovy b/src/test/gls/types/BooleanExpressionConversionTest.groovy
index 63358f4..f669862 100644
--- a/src/test/gls/types/BooleanExpressionConversionTest.groovy
+++ b/src/test/gls/types/BooleanExpressionConversionTest.groovy
@@ -32,7 +32,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo(256)
"""
}
-
+
void testLong() {
assertScript """
boolean foo(long i){
@@ -44,7 +44,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo(256)
"""
}
-
+
void testFloat() {
assertScript """
boolean foo(float i){
@@ -56,7 +56,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo(256)
"""
}
-
+
void testDouble() {
assertScript """
boolean foo(double i){
@@ -68,7 +68,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo(256)
"""
}
-
+
void testChar() {
assertScript """
boolean foo(char i){
@@ -80,7 +80,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo((char)256)
"""
}
-
+
void testByte() {
assertScript """
boolean foo(byte i){
@@ -92,7 +92,7 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert !foo((byte)256)
"""
}
-
+
void testShort() {
assertScript """
boolean foo(short i){
@@ -104,5 +104,5 @@ class BooleanExpressionConversionTest extends CompilableTestSupport {
assert foo((short)256)
"""
}
-
+
}
\ No newline at end of file
diff --git a/src/test/gls/types/GroovyCastTest.groovy b/src/test/gls/types/GroovyCastTest.groovy
index fb86cff..c1b76af 100644
--- a/src/test/gls/types/GroovyCastTest.groovy
+++ b/src/test/gls/types/GroovyCastTest.groovy
@@ -31,7 +31,7 @@ class GroovyCastTest extends CompilableTestSupport {
assert t.foo() == 2
"""
}
-
+
void testSAMProperty() {
assertScript """
interface SAM { def foo(); }
@@ -42,7 +42,7 @@ class GroovyCastTest extends CompilableTestSupport {
assert x.s.foo() == 1
"""
}
-
+
void testSAMAttribute() {
assertScript """
interface SAM { def foo(); }
@@ -57,7 +57,7 @@ class GroovyCastTest extends CompilableTestSupport {
assert x.s.foo() == 2
"""
}
-
+
void testSAMType() {
assertScript """
interface Foo {int foo()}
diff --git a/src/test/groovy/AbstractClassAndInterfaceTest.groovy b/src/test/groovy/AbstractClassAndInterfaceTest.groovy
index 92440ff..0df984c 100644
--- a/src/test/groovy/AbstractClassAndInterfaceTest.groovy
+++ b/src/test/groovy/AbstractClassAndInterfaceTest.groovy
@@ -29,7 +29,7 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
void methodOne(Object o)
Object methodTwo()
}
-
+
class B implements A {
void methodOne(Object o){assert true}
Object methodTwo(){
@@ -38,7 +38,7 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
return new Object()
}
}
-
+
def b = new B();
return b.methodTwo()
"""
@@ -52,15 +52,15 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
void methodOne(Object o)
Object methodTwo()
}
-
+
class B implements A {
void methodOne(Object o){assert true}
}
-
+
def b = new B();
return b.methodTwo()
"""
-
+
shouldNotCompile """
interface A {
Object methodTwo()
@@ -68,11 +68,11 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
interface B extends A{
void methodOne(Object o)
}
-
+
class C implements A {
void methodOne(Object o){assert true}
}
-
+
def b = new C();
return b.methodTwo()
"""
@@ -100,18 +100,18 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
return new Object()
}
}
-
+
class B extends A {
void methodOne(Object o){assert true}
}
-
+
def b = new B();
return b.methodTwo()
"""
def retVal = shell.evaluate(text)
assert retVal.class == Object
}
-
+
void testClassExtendingAnAbstractClassButMissesMethod() {
shouldNotCompile """
abstract class A {
@@ -123,17 +123,17 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
}
abstract void MethodThree()
}
-
+
abstract class B extends A {
void methodOne(Object o){assert true}
}
-
+
class C extends B{}
-
+
def b = new C();
return b.methodTwo()
"""
-
+
shouldNotCompile """
abstract class A {
abstract void methodOne(Object o)
@@ -144,27 +144,27 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
}
abstract void MethodThree()
}
-
+
class B extends A {
void methodOne(Object o){assert true}
}
-
+
def b = new B();
return b.methodTwo()
"""
}
-
+
void testInterfaceAbstractClassCombination() {
def shell = new GroovyShell()
def text = """
interface A {
void methodOne()
}
-
+
abstract class B implements A{
abstract void methodTwo()
}
-
+
class C extends B {
void methodOne(){assert true}
void methodTwo(){
@@ -175,31 +175,31 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
c.methodTwo()
"""
shell.evaluate(text)
-
+
shouldNotCompile """
interface A {
void methodOne()
}
-
+
abstract class B implements A{
abstract void methodTwo()
}
-
+
class C extends B {}
def c = new c()
c.methodTwo()
"""
}
-
+
void testDefaultModifiersForInterfaces() {
def shell = new GroovyShell()
def text = """
import java.lang.reflect.Modifier
-
+
interface A {
def foo
}
-
+
def fields = A.class.declaredFields
assert fields.length==1
assert fields[0].name == "foo"
@@ -209,7 +209,7 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
"""
shell.evaluate(text)
}
-
+
void testAccessToInterfaceField() {
def shell = new GroovyShell()
def text = """
@@ -247,14 +247,14 @@ class AbstractClassAndInterfaceTest extends CompilableTestSupport {
}
"""
}
-
+
void testClassImplementsItselfCreatingACycle() {
def scriptStr = """
package p1
class XXX implements XXX {}
"""
shouldNotCompile scriptStr
-
+
scriptStr = """
class YYY implements YYY {}
"""
diff --git a/src/test/groovy/ActorTest.groovy b/src/test/groovy/ActorTest.groovy
index 815626f..631a6eb 100644
--- a/src/test/groovy/ActorTest.groovy
+++ b/src/test/groovy/ActorTest.groovy
@@ -198,7 +198,7 @@ class WorkerThread {
}
}
finally {
- return
+ return
}
}
}
diff --git a/src/test/groovy/ArrayAutoboxingTest.groovy b/src/test/groovy/ArrayAutoboxingTest.groovy
index 24c01f6..313af3f 100644
--- a/src/test/groovy/ArrayAutoboxingTest.groovy
+++ b/src/test/groovy/ArrayAutoboxingTest.groovy
@@ -21,7 +21,7 @@ package groovy
import groovy.test.GroovyTestCase
class ArrayAutoboxingTest extends GroovyTestCase {
-
+
void testUnwantedAutoboxingWhenInvokingMethods() {
def cl
cl = blah2(new int[2*2])
@@ -39,9 +39,9 @@ class ArrayAutoboxingTest extends GroovyTestCase {
cl = blah2(new float[2*2])
assert cl == "[F"
}
-
+
def blah2(Object o) {
return o.class.name
}
-
-}
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/src/test/groovy/ArrayParamMethodTest.groovy b/src/test/groovy/ArrayParamMethodTest.groovy
index 638c76f..73e53d1 100644
--- a/src/test/groovy/ArrayParamMethodTest.groovy
+++ b/src/test/groovy/ArrayParamMethodTest.groovy
@@ -24,18 +24,18 @@ class ArrayParamMethodTest extends GroovyTestCase implements DummyInterface {
void testMethodCall() {
def array = "a b c".split(' ')
-
+
assert array.size() == 3
-
+
methodWithArrayParam(array)
}
-
+
void methodWithArrayParam(String[] args) {
// lets turn it into a list
def list = args.toList()
assert list instanceof java.util.List
list[4] = "e"
-
+
assert list == ["a", "b", "c", null, "e"]
}
}
\ No newline at end of file
diff --git a/src/test/groovy/AsTest.groovy b/src/test/groovy/AsTest.groovy
index ca0aa69..9ecd1f7 100644
--- a/src/test/groovy/AsTest.groovy
+++ b/src/test/groovy/AsTest.groovy
@@ -84,19 +84,19 @@ class AsTest extends GroovyTestCase {
assert subject.class == Float
assert subject == 1.345F
}
-
+
void testFloatAsBigDecimal() {
subject = 0.1f as BigDecimal
assert subject.class == BigDecimal
assert subject == 0.1
}
-
+
void testDoubleAsBigDecimal() {
subject = 0.1d as BigDecimal
assert subject.class == BigDecimal
assert subject == 0.1
}
-
+
void testFloatAsDouble() {
subject = 0.1f as Double
assert subject.class == Double
@@ -108,7 +108,7 @@ class AsTest extends GroovyTestCase {
assert subject.class == Byte // "as" wraps types
assert subject == 42
}
-
+
void testGStringAsShort() {
subject = "${42}" as short
assert subject.class == Short // "as" wraps types
diff --git a/src/test/groovy/Bar.groovy b/src/test/groovy/Bar.groovy
index 78e3526..083d6a6 100644
--- a/src/test/groovy/Bar.groovy
+++ b/src/test/groovy/Bar.groovy
@@ -39,7 +39,7 @@ class Cheddar extends Goober implements Runnable
void run() { cheeseIt() }
static Goober mutateGoober(Goober theGoober) { }
-
+
}
class Provolone
diff --git a/src/test/groovy/BindingTest.groovy b/src/test/groovy/BindingTest.groovy
index 892a736..286401c 100644
--- a/src/test/groovy/BindingTest.groovy
+++ b/src/test/groovy/BindingTest.groovy
@@ -25,27 +25,27 @@ class BindingTest extends GroovyTestCase {
void testProperties() {
def b = new Binding()
b.setVariable("foo", 123)
-
+
assert b.foo == 123
-
+
b.bar = 456
-
+
assert b.getVariable("bar") == 456
assert b["bar"] == 456
-
+
b["a.b.c"] = 'abc'
-
+
assert b.getVariable("a.b.c") == 'abc'
assert b["a.b.c"] == 'abc'
}
-
+
void testHasVariable() {
def b = new Binding()
assert !b.hasVariable("dummy")
-
+
b.setVariable("foo", 123)
assert !b.hasVariable("dummy")
-
+
b.setVariable("dummy", "I'm here!")
assert b.hasVariable("dummy")
}
diff --git a/src/test/groovy/CastTest.groovy b/src/test/groovy/CastTest.groovy
index ef4a4f5..964b28d 100644
--- a/src/test/groovy/CastTest.groovy
+++ b/src/test/groovy/CastTest.groovy
@@ -23,22 +23,22 @@ import groovy.test.GroovyTestCase
class CastTest extends GroovyTestCase {
Short b = 1
-
+
void testCast() {
def x = (Short) 5
assert x.class == Short
-
+
methodWithShort(x)
}
-
+
void testImplicitCast() {
Short x = 6
-
+
assert x.class == Short , "Type is ${x.class}"
-
+
methodWithShort(x)
-
+
x = 7
assert x.class == Short , "Type is ${x.class}"
}
@@ -46,22 +46,22 @@ class CastTest extends GroovyTestCase {
void testImplicitCastOfField() {
assert b.class == Short , "Type is ${b.class}"
-
+
b = 5
-
+
assert b.class == Short , "Type is ${b.class}"
}
-
+
void testIntCast() {
def i = (Integer) 'x'
-
+
assert i instanceof Integer
}
-
+
void testCharCompare() {
def i = (Integer) 'x'
def c = 'x'
-
+
assert i == c
assert i =='x'
assert c == 'x'
@@ -72,25 +72,25 @@ class CastTest extends GroovyTestCase {
assert 'x' == c
assert 'x' == i
}
-
+
void testCharCast() {
def c = (Character) 'x'
-
+
assert c instanceof Character
-
+
c = (Character)10
-
+
assert c instanceof Character
}
-
+
void methodWithShort(Short s) {
assert s.class == Short
}
-
+
void methodWithChar(Character x) {
def text = "text"
def idx = text.indexOf(x)
-
+
assert idx == 2
}
// br
@@ -112,14 +112,14 @@ class CastTest extends GroovyTestCase {
void testAsSet() {
def mySet = [2, 3, 4, 3] as SortedSet
assert mySet instanceof SortedSet
-
+
// identity test
mySet = {} as SortedSet
assert mySet.is ( mySet as SortedSet )
-
+
mySet = [2, 3, 4, 3] as Set
assert mySet instanceof HashSet
-
+
// identitiy test
mySet = {} as Set
assert mySet.is ( mySet as Set )
@@ -169,13 +169,13 @@ class CastTest extends GroovyTestCase {
def h = ['100', '200'] as int[]
assert h == [100, 200]
assert h.class.componentType == int
-
+
def sa = [null,"1"] as String[]
assert sa[0]==null
assert sa[1]=="1"
assert sa.class.componentType == String
}
-
+
void testCastString() {
// this test must pass on 1.7.x
// see GROOVY-3978, GROOVY-4657, GROOVY-4669
diff --git a/src/test/groovy/ClassExpressionTest.groovy b/src/test/groovy/ClassExpressionTest.groovy
index 29c664d..78f7b96 100644
--- a/src/test/groovy/ClassExpressionTest.groovy
+++ b/src/test/groovy/ClassExpressionTest.groovy
@@ -20,31 +20,31 @@ package groovy
import groovy.test.GroovyTestCase
-/**
+/**
* Tests the use of classes as variable expressions
*/
class ClassExpressionTest extends GroovyTestCase {
void testUseOfClass() {
def x = String
-
+
assert x != null
assert x.getName().endsWith('String')
assert x.name.endsWith('String')
x = Integer
-
+
assert x != null
assert x.name.endsWith('Integer')
-
+
x = GroovyTestCase
-
+
assert x != null
assert x.name.endsWith('GroovyTestCase')
-
+
x = ClassExpressionTest
-
+
assert x != null
}
@@ -56,7 +56,7 @@ class ClassExpressionTest extends GroovyTestCase {
assert x.class == x.getClass();
}
-
+
void testPrimitiveClasses() {
assert void == Void.TYPE
assert int == Integer.TYPE
@@ -67,7 +67,7 @@ class ClassExpressionTest extends GroovyTestCase {
assert long == Long.TYPE
assert short == Short.TYPE
}
-
+
void testArrayClassReference() {
def foo = int[]
assert foo.name == "[I"
diff --git a/src/test/groovy/ClassLoaderBug.groovy b/src/test/groovy/ClassLoaderBug.groovy
index 256f334..ea89589 100644
--- a/src/test/groovy/ClassLoaderBug.groovy
+++ b/src/test/groovy/ClassLoaderBug.groovy
@@ -21,7 +21,7 @@ package groovy
import groovy.test.GroovyTestCase
class ClassLoaderBug extends GroovyTestCase {
-
+
static void main(args) {
def gst = new ClassLoaderBug();
gst.testWithOneVariable();
diff --git a/src/test/groovy/ClassTest.groovy b/src/test/groovy/ClassTest.groovy
index 8795c28..4c02c69 100644
--- a/src/test/groovy/ClassTest.groovy
+++ b/src/test/groovy/ClassTest.groovy
@@ -26,11 +26,11 @@ class ClassTest extends GroovyTestCase {
def c = String.class
assert c instanceof Class
assert c.name == "java.lang.String" , c.name
-
+
c = GroovyTestCase.class
assert c instanceof Class
assert c.name.endsWith("GroovyTestCase") , c.name
-
+
c = ClassTest.class
assert c instanceof Class
assert c.name.endsWith("ClassTest") , c.name
diff --git a/src/test/groovy/ClosureDefaultParameterTest.groovy b/src/test/groovy/ClosureDefaultParameterTest.groovy
index 0e70575..5f2915d 100644
--- a/src/test/groovy/ClosureDefaultParameterTest.groovy
+++ b/src/test/groovy/ClosureDefaultParameterTest.groovy
@@ -38,7 +38,7 @@ class ClosureDefaultParameterTest extends GroovyTestCase {
assert block2(456) == "456 abc"
assert block2(456, "def") == "456 def"
}
-
+
void testClosureWithDefaultParamFromOuterScope() {
def y = 555
def boo = {x = y -> x}
diff --git a/src/test/groovy/ClosureMethodCallTest.groovy b/src/test/groovy/ClosureMethodCallTest.groovy
index feac6bf..4a68974 100644
--- a/src/test/groovy/ClosureMethodCallTest.groovy
+++ b/src/test/groovy/ClosureMethodCallTest.groovy
@@ -100,7 +100,7 @@ class ClosureMethodCallTest extends GroovyTestCase {
class Y {
def m() {1}
}
-
+
ref = Y.&m
assert ref(new Y()) == 1
'''
diff --git a/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy b/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
index c05a19e..f39edc9 100644
--- a/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
+++ b/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
@@ -34,14 +34,14 @@ class ClosureReturnWithoutReturnStatementTest extends GroovyTestCase {
void testReturnValueUsingFunction() {
def block = {x-> someFunction(x) }
-
+
def value = block.call(10)
assert value
value = block.call(3)
assert value == false
}
-
+
def someFunction(x) {
x > 5
}
diff --git a/src/test/groovy/CompareToTest.groovy b/src/test/groovy/CompareToTest.groovy
index c8a94a2..435e90b 100644
--- a/src/test/groovy/CompareToTest.groovy
+++ b/src/test/groovy/CompareToTest.groovy
@@ -27,7 +27,7 @@ class CompareToTest extends GroovyTestCase {
def a = 12
def b = 20
def c = 30
-
+
def result = a <=> b
assert result < 0
@@ -36,23 +36,23 @@ class CompareToTest extends GroovyTestCase {
result = c <=> b
assert result > 0
-
+
assert (a <=> b) < 0
assert a <=> 12 == 0
assert (c <=> b) > 0
}
void testNullCompares() {
-
+
def a = 123
def b = null
-
+
def result = a <=> b
assert result > 0
-
+
result = b <=> a
assert result < 0
-
+
result = b <=> null
assert result == 0
}
diff --git a/src/test/groovy/CompareTypesTest.groovy b/src/test/groovy/CompareTypesTest.groovy
index 02b0d8d..2b3549f 100644
--- a/src/test/groovy/CompareTypesTest.groovy
+++ b/src/test/groovy/CompareTypesTest.groovy
@@ -23,76 +23,74 @@ import groovy.test.GroovyTestCase
/**
*/
class CompareTypesTest extends GroovyTestCase {
- void testCompareByteToInt() {
+ void testCompareByteToInt() {
Byte a = 12
Integer b = 10
-
+
assert a instanceof Byte
assert b instanceof Integer
-
+
assert a > b
- }
-
- void testCompareByteToDouble() {
+ }
+
+ void testCompareByteToDouble() {
Byte a = 12
Double b = 10
-
+
assert a instanceof Byte
assert b instanceof Double
-
+
assert a > b
- }
-
- void testCompareLongToDouble() {
+ }
+
+ void testCompareLongToDouble() {
Long a = 12
Double b = 10
-
+
assert a instanceof Long
assert b instanceof Double
-
+
... 14679 lines suppressed ...