From 5e2b1c1fcd4f7bdd979d7a73edd25ecb80974eb1 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sun, 15 Aug 2021 18:08:41 -0300 Subject: [PATCH] Package rename --- Kores | 2 +- build.gradle | 6 +- .../kores/bytecode/BytecodeClass.kt | 8 +- .../kores/bytecode/BytecodeModule.kt | 4 +- .../kores/bytecode/BytecodeOptions.kt | 26 +-- .../classloader/BytecodeCodeClassLoader.kt | 158 ++++++++++++++++++ .../CachedBytecodeCodeClassLoader.kt | 55 ++++++ .../classloader/CachedCodeClassLoader.kt | 4 +- .../kores/bytecode/classloader/ClassInject.kt | 10 +- .../bytecode/classloader/CodeClassLoader.kt | 14 +- .../classloader/LoadedBytecodeClass.kt | 37 ++++ .../kores/bytecode/common/Flow.kt | 4 +- .../kores/bytecode/common/Frame.kt | 6 +- .../bytecode/common/MethodVisitorHelper.kt | 8 +- .../kores/bytecode/common/Timed.kt | 2 +- .../kores/bytecode/common/Variable.kt | 4 +- .../kores/bytecode/doc/Doc.kt | 2 +- .../kores/bytecode/doc/IndyConcatLogic.kt | 6 +- .../kores/bytecode/doc/IndyGenerationLogic.kt | 2 +- .../kores/bytecode/doc/NestLogic.kt | 6 +- .../bytecode/exception/ClassCheckException.kt | 8 +- .../kores/bytecode/extra/Dup.kt | 10 +- .../kores/bytecode/extra/Pop.kt | 4 +- .../kores/bytecode/post/DeadCodeRemover.kt | 2 +- .../kores/bytecode/post/GotoOptimizer.kt | 2 +- .../kores/bytecode/post/MethodProcessor.kt | 2 +- .../kores/bytecode/post/PostProcessor.kt | 2 +- .../kores/bytecode/post/Processor.kt | 2 +- .../kores/bytecode/pre/GenLineVisitor.kt | 16 +- .../bytecode/processor/BytecodeGenerator.kt | 48 +++--- .../kores/bytecode/processor/Keys.kt | 28 ++-- .../processor/processors/AccessProcessor.kt | 10 +- .../processors/AnnotableProcessor.kt | 10 +- .../processors/AnnotationProcessor.kt | 14 +- .../processors/AnnotationPropertyProcessor.kt | 22 +-- .../processors/ArgumentsHolderProcessor.kt | 28 ++-- .../processors/ArrayAccessProcessor.kt | 14 +- .../processors/ArrayConstructProcessor.kt | 26 +-- .../processors/ArrayLengthProcessor.kt | 16 +- .../processors/ArrayLoadProcessor.kt | 26 +-- .../processors/ArrayStoreProcessor.kt | 24 +-- .../processors/BytecodeIfStatementHelper.kt | 44 ++--- .../processor/processors/CastProcessor.kt | 36 ++-- .../processor/processors/ConcatProcessor.kt | 52 +++--- .../processors/ControlFlowProcessor.kt | 14 +- .../processor/processors/DupProcessor.kt | 14 +- .../processors/ElementsHolderProcessor.kt | 16 +- .../processors/EnumDeclarationProcessor.kt | 12 +- .../processors/FieldAccessProcessor.kt | 22 +-- .../processors/FieldDeclarationProcessor.kt | 32 ++-- .../processors/FieldDefinitionProcessor.kt | 20 +-- .../processor/processors/ForEachProcessor.kt | 26 +-- .../processors/ForStatementProcessor.kt | 30 ++-- .../processor/processors/IfExprProcessor.kt | 18 +- .../processors/IfStatementProcessor.kt | 14 +- .../processors/InstanceOfProcessor.kt | 16 +- .../processors/InstructionCodePart.kt | 8 +- .../processors/InstructionsProcessor.kt | 10 +- .../processors/InvokeDynamicProcessor.kt | 20 +-- .../processor/processors/LabelProcessor.kt | 16 +- .../processor/processors/LineProcessor.kt | 24 +-- .../processor/processors/LiteralProcessor.kt | 14 +- .../processors/LocalCodeProcessor.kt | 14 +- .../processors/MethodDeclarationProcessor.kt | 40 ++--- .../processors/MethodInvocationProcessor.kt | 30 ++-- .../processors/ModuleDeclarationProcessor.kt | 22 +-- .../processor/processors/NewProcessor.kt | 12 +- .../processor/processors/OperateProcessor.kt | 36 ++-- .../processor/processors/PopProcessor.kt | 10 +- .../processor/processors/ReturnProcessor.kt | 34 ++-- .../processors/ScopeAccessProcessor.kt | 20 +-- .../processor/processors/StackProcessor.kt | 10 +- .../processors/StaticBlockProcessor.kt | 34 ++-- .../processor/processors/SwitchProcessor.kt | 46 ++--- .../processors/SynchronizedProcessor.kt | 32 ++-- .../processors/ThrowExceptionProcessor.kt | 16 +- .../processors/TryStatementProcessor.kt | 30 ++-- .../processors/TryWithResourcesProcessor.kt | 20 +-- .../processors/TypeDeclarationProcessor.kt | 50 +++--- .../bytecode/processor/processors/Util.kt | 30 ++-- .../processors/VariableAccessProcessor.kt | 16 +- .../VariableDeclarationProcessor.kt | 20 +-- .../processors/VariableDefinitionProcessor.kt | 22 +-- .../processors/VariableOperateProcessor.kt | 22 +-- .../processors/WhileStatementProcessor.kt | 20 +-- .../kores/bytecode/util/AnnotationUtil.kt | 10 +- .../bytecode/util/AnnotationVisitorCapable.kt | 4 +- .../kores/bytecode/util/ArrayUtil.kt | 6 +- .../kores/bytecode/util/BridgeUtil.kt | 20 +-- .../kores/bytecode/util/ClassSaveUtil.kt | 14 +- .../kores/bytecode/util/CodePartUtil.kt | 8 +- .../kores/bytecode/util/CodeTypeUtil.kt | 22 +-- .../kores/bytecode/util/ConstructorUtil.kt | 30 ++-- .../kores/bytecode/util/Consts.kt | 2 +- .../kores/bytecode/util/EnumUtil.kt | 26 +-- .../kores/bytecode/util/IfUtil.kt | 2 +- .../kores/bytecode/util/InsnUtil.kt | 2 +- .../kores/bytecode/util/InvokeTypeUtil.kt | 10 +- .../kores/bytecode/util/LiteralUtil.kt | 18 +- .../bytecode/util/MethodInvocationUtil.kt | 26 +-- .../kores/bytecode/util/MethodsUtil.kt | 14 +- .../kores/bytecode/util/ModifierUtil.kt | 8 +- .../kores/bytecode/util/ObjectCache.kt | 2 +- .../kores/bytecode/util/OperatorUtil.kt | 18 +- .../kores/bytecode/util/ParameterUtil.kt | 6 +- .../kores/bytecode/util/SwitchOnEnum.kt | 26 +-- .../bytecode/util/asm/ParameterVisitor.kt | 4 +- .../kores/test/asm/AnnotatedTest.java | 6 +- .../kores/test/asm/AnnotationTest.java | 6 +- .../kores/test/asm/ArrayParameterTest.java | 18 +- .../kores/test/asm/ArrayTest.java | 6 +- .../kores/test/asm/BCLoader.java | 4 +- .../kores/test/asm/BitwiseIfTest.java | 6 +- .../kores/test/asm/BridgeMethodsTest.java | 46 ++--- .../kores/test/asm/BridgeMethodsTest2.java | 20 +-- .../kores/test/asm/BridgeMethodsTest3.java | 18 +- .../kores/test/asm/CallMethodFragment.java | 6 +- .../kores/test/asm/CastBugTest.java | 22 +-- .../kores/test/asm/ClSaverTest.java | 22 +-- .../kores/test/asm/CommonBytecodeTest.java | 18 +- .../kores/test/asm/ComplexIfTest.java | 16 +- .../kores/test/asm/ConcatTest.java | 6 +- .../kores/test/asm/DoubleTest.java | 34 ++-- .../kores/test/asm/DupTest.java | 32 ++-- .../kores/test/asm/EnumTest.java | 6 +- .../kores/test/asm/FakeElvisTest.java | 6 +- .../kores/test/asm/FinalFieldWithThis.java | 30 ++-- .../kores/test/asm/FinallyTest.java | 32 ++-- .../kores/test/asm/FireEnumTest.java | 38 ++--- .../kores/test/asm/ForEachArrayClassTest.java | 6 +- .../kores/test/asm/ForEachClassTest.java | 6 +- .../kores/test/asm/GenericClassTest.java | 6 +- .../kores/test/asm/GenericInterfaceTest.java | 12 +- .../kores/test/asm/IndifyConcatTest.java | 10 +- .../kores/test/asm/IndyTest.java | 33 ++-- .../kores/test/asm/InnerClassTest.java | 12 +- .../kores/test/asm/InstanceOfTest.java | 6 +- .../kores/test/asm/InterfaceTest.java | 30 ++-- .../kores/test/asm/InvCall.java | 26 +-- .../asm/InvokeSuperConstructorBugTest.java | 18 +- .../kores/test/asm/InvokeSuperTest.java | 26 +-- .../kores/test/asm/KoresTestBytecode.java | 50 +++--- .../kores/test/asm/KoresTest_API.java | 26 +-- .../kores/test/asm/LineTest.java | 10 +- .../kores/test/asm/LiteralBugTest.java | 22 +-- .../kores/test/asm/LocalClassTest.java | 6 +- .../kores/test/asm/LocalLambdaBugTest.java | 50 +++--- .../kores/test/asm/LocalsReuseTest.java | 28 ++-- .../kores/test/asm/NewIfTest.java | 20 +-- .../kores/test/asm/OperateTest.java | 6 +- .../kores/test/asm/PrimitiveCast.java | 48 +++--- .../test/asm/RecursiveGenericTypeTest.java | 26 +-- .../kores/test/asm/ResultSaver.java | 8 +- .../test/asm/SelfPrivateAccessBugTest.java | 18 +- .../kores/test/asm/SimpleTest2_Bytecode.java | 52 +++--- .../kores/test/asm/SwitchTest.java | 6 +- .../kores/test/asm/SynchronizedTest.java | 6 +- .../kores/test/asm/TestBytecode.java | 6 +- .../test/asm/TestBytecode_Invocations.java | 6 +- .../kores/test/asm/TestHelloBytecode.java | 28 ++-- .../kores/test/asm/TestLoopBytecode.java | 34 ++-- .../kores/test/asm/Transformer.java | 28 ++-- .../kores/test/asm/TryCatchFinallyTest.java | 30 ++-- .../kores/test/asm/TryTest.java | 24 +-- .../kores/test/asm/TryWithResourcesTest.java | 6 +- .../kores/test/asm/TypeBugTest.java | 22 +-- .../test/asm/VariableNotDefinedBugTest.java | 16 +- .../kores/test/asm/Wiki.java | 42 ++--- .../kores/test/asm/Base.kt | 2 +- ...notatedTestClass_Result.class.disassembled | 6 +- ...rayParameterTest_Result.class.disassembled | 16 +- ...monGen_Generated_Result.class.disassembled | 6 +- ...geMethodsBugTest_Result.class.disassembled | 2 +- ...ridgeMethodTest2_Result.class.disassembled | 6 +- ...ridgeMethodTest3_Result.class.disassembled | 6 +- ...ridgeMethodTest4_Result.class.disassembled | 6 +- ...ridgeMethodTest3_Result.class.disassembled | 6 +- ...ridgeMethodsTest_Result.class.disassembled | 4 +- ...eAPITestBytecode_Result.class.disassembled | 10 +- .../CodeAPITest_API_Result.class.disassembled | 4 +- ...pTest_getNotNull_Result.class.disassembled | 4 +- ..._DupTest_getNull_Result.class.disassembled | 4 +- .../EnumTest_MyEnum_Result.class.disassembled | 6 +- ...st_FakeElvisTest_Result.class.disassembled | 14 +- ...eldWithThis_Test_Result.class.disassembled | 16 +- ...eEnumTest_Option_Result.class.disassembled | 4 +- ...lassTest_ForEach_Result.class.disassembled | 4 +- ...dyTest_Generated_Result.class.disassembled | 10 +- .../InvCall_Result.class.disassembled | 8 +- ...SuperConstructor_Result.class.disassembled | 8 +- .../InvokeSuperTest_Result.class.disassembled | 8 +- ...oresTestBytecode_Result.class.disassembled | 12 +- .../KoresTest_API_Result.class.disassembled | 6 +- .../PrimitiveCast_Result.class.disassembled | 6 +- ...TypeTest_MyClass_Result.class.disassembled | 4 +- ...hOnEnum$Mappings_Result.class.disassembled | 6 +- ...hOnEnum$Mappings_Result.class.disassembled | 6 +- ...hOnEnum$Mappings_Result.class.disassembled | 85 ++++++++++ ..._SwitchTestClass_Result.class.disassembled | 14 +- ...sTest__Generated_Result.class.disassembled | 20 +-- .../Transformer_Result.class.disassembled | 20 +-- ..._TryCatchFinally_Result.class.disassembled | 6 +- ...sourcesTestClass_Result.class.disassembled | 22 +-- 203 files changed, 1955 insertions(+), 1625 deletions(-) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/BytecodeClass.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/BytecodeModule.kt (94%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/BytecodeOptions.kt (92%) create mode 100644 src/main/kotlin/com/koresframework/kores/bytecode/classloader/BytecodeCodeClassLoader.kt create mode 100644 src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedBytecodeCodeClassLoader.kt rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/classloader/CachedCodeClassLoader.kt (94%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/classloader/ClassInject.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/classloader/CodeClassLoader.kt (86%) create mode 100644 src/main/kotlin/com/koresframework/kores/bytecode/classloader/LoadedBytecodeClass.kt rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/common/Flow.kt (95%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/common/Frame.kt (98%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/common/MethodVisitorHelper.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/common/Timed.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/common/Variable.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/doc/Doc.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/doc/IndyConcatLogic.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/doc/IndyGenerationLogic.kt (99%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/doc/NestLogic.kt (95%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/exception/ClassCheckException.kt (85%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/extra/Dup.kt (91%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/extra/Pop.kt (94%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/post/DeadCodeRemover.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/post/GotoOptimizer.kt (98%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/post/MethodProcessor.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/post/PostProcessor.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/post/Processor.kt (98%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/pre/GenLineVisitor.kt (93%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/BytecodeGenerator.kt (87%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/Keys.kt (89%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/AccessProcessor.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/AnnotableProcessor.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/AnnotationProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt (79%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArrayAccessProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArrayConstructProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArrayLengthProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArrayLoadProcessor.kt (77%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ArrayStoreProcessor.kt (79%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/CastProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ConcatProcessor.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ControlFlowProcessor.kt (88%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/DupProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ElementsHolderProcessor.kt (89%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/FieldAccessProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt (73%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ForEachProcessor.kt (91%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ForStatementProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/IfExprProcessor.kt (80%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/IfStatementProcessor.kt (88%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/InstanceOfProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/InstructionCodePart.kt (91%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/InstructionsProcessor.kt (89%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/LabelProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/LineProcessor.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/LiteralProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/LocalCodeProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt (89%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/MethodInvocationProcessor.kt (87%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/NewProcessor.kt (84%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/OperateProcessor.kt (83%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/PopProcessor.kt (85%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ReturnProcessor.kt (81%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ScopeAccessProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/StackProcessor.kt (85%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/StaticBlockProcessor.kt (78%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/SwitchProcessor.kt (92%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/SynchronizedProcessor.kt (76%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/TryStatementProcessor.kt (88%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt (91%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/Util.kt (94%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/VariableAccessProcessor.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt (82%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt (83%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/VariableOperateProcessor.kt (85%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/processor/processors/WhileStatementProcessor.kt (88%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/AnnotationUtil.kt (93%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/AnnotationVisitorCapable.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ArrayUtil.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/BridgeUtil.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ClassSaveUtil.kt (85%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/CodePartUtil.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/CodeTypeUtil.kt (92%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ConstructorUtil.kt (91%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/Consts.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/EnumUtil.kt (95%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/IfUtil.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/InsnUtil.kt (98%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/InvokeTypeUtil.kt (95%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/LiteralUtil.kt (90%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/MethodInvocationUtil.kt (94%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/MethodsUtil.kt (86%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ModifierUtil.kt (96%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ObjectCache.kt (97%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/OperatorUtil.kt (93%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/ParameterUtil.kt (93%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/SwitchOnEnum.kt (92%) rename src/main/kotlin/com/{github/jonathanxd => koresframework}/kores/bytecode/util/asm/ParameterVisitor.kt (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/AnnotatedTest.java (91%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/AnnotationTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ArrayParameterTest.java (84%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ArrayTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/BCLoader.java (94%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/BitwiseIfTest.java (94%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/BridgeMethodsTest.java (82%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/BridgeMethodsTest2.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/BridgeMethodsTest3.java (86%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/CallMethodFragment.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/CastBugTest.java (81%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ClSaverTest.java (79%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/CommonBytecodeTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ComplexIfTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ConcatTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/DoubleTest.java (78%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/DupTest.java (79%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/EnumTest.java (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/FakeElvisTest.java (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/FinalFieldWithThis.java (74%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/FinallyTest.java (77%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/FireEnumTest.java (94%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ForEachArrayClassTest.java (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ForEachClassTest.java (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/GenericClassTest.java (91%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/GenericInterfaceTest.java (86%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/IndifyConcatTest.java (89%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/IndyTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InnerClassTest.java (88%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InstanceOfTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InterfaceTest.java (80%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InvCall.java (83%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InvokeSuperConstructorBugTest.java (85%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/InvokeSuperTest.java (82%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/KoresTestBytecode.java (86%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/KoresTest_API.java (81%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/LineTest.java (89%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/LiteralBugTest.java (80%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/LocalClassTest.java (92%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/LocalLambdaBugTest.java (83%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/LocalsReuseTest.java (83%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/NewIfTest.java (85%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/OperateTest.java (93%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/PrimitiveCast.java (78%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/RecursiveGenericTypeTest.java (84%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/ResultSaver.java (96%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/SelfPrivateAccessBugTest.java (88%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/SimpleTest2_Bytecode.java (83%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/SwitchTest.java (94%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/SynchronizedTest.java (91%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TestBytecode.java (95%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TestBytecode_Invocations.java (95%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TestHelloBytecode.java (86%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TestLoopBytecode.java (87%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/Transformer.java (90%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TryCatchFinallyTest.java (85%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TryTest.java (88%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TryWithResourcesTest.java (91%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/TypeBugTest.java (80%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/VariableNotDefinedBugTest.java (84%) rename src/test/java/com/{github/jonathanxd => koresframework}/kores/test/asm/Wiki.java (76%) rename src/test/kotlin/com/{github/jonathanxd => koresframework}/kores/test/asm/Base.kt (97%) create mode 100644 src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled diff --git a/Kores b/Kores index fd4d74c..6885767 160000 --- a/Kores +++ b/Kores @@ -1 +1 @@ -Subproject commit fd4d74caafdd98b8798b3251ec36e57d5f211f42 +Subproject commit 68857671a51454a4ca0eb3b5e0d727160c46ec83 diff --git a/build.gradle b/build.gradle index 3ef2950..a49ab68 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { } -group 'com.github.koresframework' -version '4.1.10.bytecode.4' +group 'com.koresframework' +version '4.2.1.bytecode' apply from: project(":Kores").file("gradle/common.gradle") @@ -59,7 +59,7 @@ dependencies { // with runtime dependency pointing to Kores published version //compile project(":Kores") compileOnly project(":Kores") - runtimeOnly "com.github.koresframework:kores:4.1.9.base" + runtimeOnly "com.koresframework:kores:4.2.1.base" implementation 'com.github.jonathanxd:bytecode-disassembler:2.4.1' implementation "org.ow2.asm:asm:9.2" implementation "org.ow2.asm:asm-analysis:9.2" diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeClass.kt b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeClass.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeClass.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/BytecodeClass.kt index 0ce9910..efbbe13 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeClass.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeClass.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode +package com.koresframework.kores.bytecode import com.github.jonathanxd.bytecodedisassembler.Disassembler -import com.github.jonathanxd.kores.base.ModuleDeclaration -import com.github.jonathanxd.kores.base.Named -import com.github.jonathanxd.kores.base.TypeDeclaration +import com.koresframework.kores.base.ModuleDeclaration +import com.koresframework.kores.base.Named +import com.koresframework.kores.base.TypeDeclaration /** * @property declaration Declaration that produced [bytecode]. Common types are [TypeDeclaration] and [ModuleDeclaration]. diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeModule.kt b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeModule.kt similarity index 94% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeModule.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/BytecodeModule.kt index 1403c40..36b5c76 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeModule.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeModule.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode +package com.koresframework.kores.bytecode import com.github.jonathanxd.bytecodedisassembler.Disassembler -import com.github.jonathanxd.kores.base.ModuleDeclaration +import com.koresframework.kores.base.ModuleDeclaration class BytecodeModule constructor(val module: ModuleDeclaration, private val bytecode_: ByteArray) { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeOptions.kt b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeOptions.kt similarity index 92% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeOptions.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/BytecodeOptions.kt index ac53ea3..8c007e1 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/BytecodeOptions.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/BytecodeOptions.kt @@ -27,17 +27,17 @@ */ @file:JvmName("BytecodeOptions") -package com.github.jonathanxd.kores.bytecode +package com.koresframework.kores.bytecode -import com.github.jonathanxd.kores.base.Line -import com.github.jonathanxd.kores.bytecode.post.DeadCodeRemover -import com.github.jonathanxd.kores.bytecode.post.GotoOptimizer -import com.github.jonathanxd.kores.bytecode.post.MethodProcessor -import com.github.jonathanxd.kores.bytecode.pre.GenLineVisitor +import com.koresframework.kores.base.Line +import com.koresframework.kores.bytecode.post.DeadCodeRemover +import com.koresframework.kores.bytecode.post.GotoOptimizer +import com.koresframework.kores.bytecode.post.MethodProcessor +import com.koresframework.kores.bytecode.pre.GenLineVisitor import com.github.jonathanxd.iutils.option.Option import com.github.jonathanxd.iutils.option.Options -import com.github.jonathanxd.kores.bytecode.doc.NestLogic -import com.github.jonathanxd.kores.bytecode.doc.IndyConcatLogic +import com.koresframework.kores.bytecode.doc.NestLogic +import com.koresframework.kores.bytecode.doc.IndyConcatLogic /** * Calls [org.objectweb.asm.util.CheckClassAdapter] to check generated class. @@ -97,14 +97,14 @@ val VALIDATE_SUPER = Option(true) * The generation of bridge methods will slow down the Generator, if you mind the performance * don't change this option. * - * The generation of bridge methods is very limited, the [Bridge Generator][com.github.jonathanxd.kores.bytecode.util.BridgeUtil] + * The generation of bridge methods is very limited, the [Bridge Generator][com.koresframework.kores.bytecode.util.BridgeUtil] * will inspect super-classes (and super-interfaces) and find the overridden method. - * The [Bridge Generator][com.github.jonathanxd.kores.bytecode.util.BridgeUtil] will only inspect - * [Java type][Class] and [Kores Type][com.github.jonathanxd.kores.base.TypeDeclaration]. - * If the super-class and/or super-interfaces is of another type, [Bridge Generator][com.github.jonathanxd.kores.bytecode.util.BridgeUtil] + * The [Bridge Generator][com.koresframework.kores.bytecode.util.BridgeUtil] will only inspect + * [Java type][Class] and [Kores Type][com.koresframework.kores.base.TypeDeclaration]. + * If the super-class and/or super-interfaces is of another type, [Bridge Generator][com.koresframework.kores.bytecode.util.BridgeUtil] * will ignore and the bridge method will not be generated. * - * You could also bridge methods manually with [com.github.jonathanxd.kores.factory.bridgeMethod]. + * You could also bridge methods manually with [com.koresframework.kores.factory.bridgeMethod]. */ @JvmField val GENERATE_BRIDGE_METHODS = Option(false) diff --git a/src/main/kotlin/com/koresframework/kores/bytecode/classloader/BytecodeCodeClassLoader.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/BytecodeCodeClassLoader.kt new file mode 100644 index 0000000..559604e --- /dev/null +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/BytecodeCodeClassLoader.kt @@ -0,0 +1,158 @@ +/* + * Kores-BytecodeWriter - Translates Kores Structure to JVM Bytecode + * + * The MIT License (MIT) + * + * Copyright (c) 2021 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/) + * Copyright (c) contributors + * + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.koresframework.kores.bytecode.classloader + +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.BytecodeClass +import com.koresframework.kores.type.`is` +import java.lang.reflect.Type + +open class BytecodeCodeClassLoader : ClassLoader { + + constructor() : super() + constructor(parent: ClassLoader) : super(parent) + + /** + * Define type declaration class. + * + * @param typeDeclaration Type declaration. + * @param bytes Bytes. + * @return Defined Class. + */ + open fun define(typeDeclaration: TypeDeclaration, bytes: ByteArray): Class<*> { + return super.defineClass(typeDeclaration.type, bytes, 0, bytes.size) + } + + /** + * Define [BytecodeClass] class. + * + * @param bytecodeClass Bytecode class. + * @return Defined Class. + */ + open fun define(bytecodeClass: BytecodeClass): Class<*> { + val type = (bytecodeClass.declaration as? TypeDeclaration) + ?: throw IllegalArgumentException("Non-TypeDeclaration loading is not supported yet. BytecodeClass: $bytecodeClass") + + return this.define(type, bytecodeClass.bytecode) + } + + /** + * Define [classes][BytecodeClass] and inner classes. + * + * Make sure that all elements in the `bytecodeClasses` is a inner type of first element. + * + * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). + * @return First Defined Class. + */ + open fun define(bytecodeClasses: Array): Class<*> { + return this.define(bytecodeClasses.iterator()) + } + + /** + * Define [classes][BytecodeClass] and inner classes. + * + * Make sure that all elements in the `bytecodeClasses` is a inner type of first element. + * + * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). + * @return First Defined Class. + */ + open fun define(bytecodeClasses: Collection): Class<*> { + return this.define(bytecodeClasses.iterator()) + } + + /** + * Define [classes][BytecodeClass] and inner classes. + * + * Make sure that all elements in the `bytecodeClasses` is a inner type of first element. + * + * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). + * @return First Defined Class. + */ + open fun define(bytecodeClasses: Iterator): Class<*> { + if (!bytecodeClasses.hasNext()) { + throw IllegalArgumentException("Empty 'bytecodeClasses' array") + } + + val bytecodeClass = bytecodeClasses.next() + + val type = (bytecodeClass.declaration as? TypeDeclaration) + ?: throw IllegalArgumentException("Non-TypeDeclaration loading is not supported yet. BytecodeClass: $bytecodeClass") + + val define = this.define(type, bytecodeClass.bytecode) + + bytecodeClasses.forEach { + this.define(it) + } + + return define + } + + /** + * Defines very [class][BytecodeClass] in [bytecodeClasses] iterator. All defined + * classes are added to provided [collection]. + * + * This function may be used to define inner classes as well as multiple individual classes. + * + * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). + * @return First Defined Class. + */ + open fun > defineEveryTo( + collection: C, + bytecodeClasses: Iterator + ): C { + if (!bytecodeClasses.hasNext()) { + throw IllegalArgumentException("Empty 'bytecodeClasses' array") + } + + val known = mutableListOf() + + while (bytecodeClasses.hasNext()) { + val bytecodeClass = bytecodeClasses.next() + + val type = (bytecodeClass.declaration as? TypeDeclaration) + ?: throw IllegalArgumentException("Non-TypeDeclaration loading is not supported yet. BytecodeClass: $bytecodeClass") + + val define = this.define(type, bytecodeClass.bytecode) + val outerType = bytecodeClass.declaration.outerType + val outerLazy by lazy { + known.firstOrNull { outerType != null && (it.bytecodeClass.declaration as Type).`is`(outerType) } + } + + val loaded = LoadedBytecodeClass( + bytecodeClass, + outerType = { outerLazy }, + loadedClass = define + ) + + collection.add(loaded) + known.add(loaded) + } + + return collection + } +} diff --git a/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedBytecodeCodeClassLoader.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedBytecodeCodeClassLoader.kt new file mode 100644 index 0000000..162d060 --- /dev/null +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedBytecodeCodeClassLoader.kt @@ -0,0 +1,55 @@ +/* + * Kores-BytecodeWriter - Translates Kores Structure to JVM Bytecode + * + * The MIT License (MIT) + * + * Copyright (c) 2021 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/) + * Copyright (c) contributors + * + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.koresframework.kores.bytecode.classloader + +import com.koresframework.kores.base.TypeDeclaration +import java.util.* + +/** + * Cache all defined classes. + */ +class CachedBytecodeCodeClassLoader : BytecodeCodeClassLoader { + + constructor() : super() + constructor(parent: ClassLoader) : super(parent) + + private val cache = mutableMapOf>() + private val immutableCache = Collections.unmodifiableMap(cache) + + override fun define(typeDeclaration: TypeDeclaration, bytes: ByteArray): Class<*> { + val define = super.define(typeDeclaration, bytes) + + this.cache[typeDeclaration] = define + + return define + } + + fun getCache(): Map> { + return this.immutableCache + } +} diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CachedCodeClassLoader.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedCodeClassLoader.kt similarity index 94% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CachedCodeClassLoader.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedCodeClassLoader.kt index 2d823e9..33df218 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CachedCodeClassLoader.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CachedCodeClassLoader.kt @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.classloader +package com.koresframework.kores.bytecode.classloader -import com.github.jonathanxd.kores.base.TypeDeclaration +import com.koresframework.kores.base.TypeDeclaration import java.util.* /** diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/ClassInject.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/ClassInject.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/ClassInject.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/classloader/ClassInject.kt index 1f1a7cb..724b537 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/ClassInject.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/ClassInject.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.classloader +package com.koresframework.kores.bytecode.classloader -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.bytecode.BytecodeClass +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.BytecodeClass /** * Class injection utility. @@ -44,7 +44,7 @@ object ClassInject { * @return Defined class * @throws IllegalStateException if the injection fails. */ - fun ClassLoader.inject(bytecodeClass: com.github.jonathanxd.kores.bytecode.BytecodeClass): Class<*> { + fun ClassLoader.inject(bytecodeClass: com.koresframework.kores.bytecode.BytecodeClass): Class<*> { val type = (bytecodeClass.declaration as? TypeDeclaration)?.type ?: throw IllegalArgumentException("Non-TypeDeclaration loading is not supported yet. BytecodeClass: $bytecodeClass") @@ -58,7 +58,7 @@ object ClassInject { * @return Defined class. * @throws IllegalStateException if the injection fails or [bytecode classes array][bytecodeClasses] is empty. */ - fun ClassLoader.inject(bytecodeClasses: Array): Class<*> { + fun ClassLoader.inject(bytecodeClasses: Array): Class<*> { if (bytecodeClasses.isEmpty()) { throw IllegalArgumentException("Empty 'bytecodeClasses' array") } diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CodeClassLoader.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CodeClassLoader.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CodeClassLoader.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/classloader/CodeClassLoader.kt index 2b2a524..9c93775 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/classloader/CodeClassLoader.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/CodeClassLoader.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.classloader +package com.koresframework.kores.bytecode.classloader -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.bytecode.BytecodeClass +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.BytecodeClass open class CodeClassLoader : ClassLoader { @@ -52,7 +52,7 @@ open class CodeClassLoader : ClassLoader { * @param bytecodeClass Bytecode class. * @return Defined Class. */ - open fun define(bytecodeClass: com.github.jonathanxd.kores.bytecode.BytecodeClass): Class<*> { + open fun define(bytecodeClass: com.koresframework.kores.bytecode.BytecodeClass): Class<*> { val type = (bytecodeClass.declaration as? TypeDeclaration) ?: throw IllegalArgumentException("Non-TypeDeclaration loading is not supported yet. BytecodeClass: $bytecodeClass") @@ -67,7 +67,7 @@ open class CodeClassLoader : ClassLoader { * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). * @return First Defined Class. */ - open fun define(bytecodeClasses: Array): Class<*> { + open fun define(bytecodeClasses: Array): Class<*> { return this.define(bytecodeClasses.iterator()) } @@ -79,7 +79,7 @@ open class CodeClassLoader : ClassLoader { * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). * @return First Defined Class. */ - open fun define(bytecodeClasses: Collection): Class<*> { + open fun define(bytecodeClasses: Collection): Class<*> { return this.define(bytecodeClasses.iterator()) } @@ -91,7 +91,7 @@ open class CodeClassLoader : ClassLoader { * @param bytecodeClasses Bytecode class (first element) and inner classes (remaining). * @return First Defined Class. */ - open fun define(bytecodeClasses: Iterator): Class<*> { + open fun define(bytecodeClasses: Iterator): Class<*> { if (!bytecodeClasses.hasNext()) { throw IllegalArgumentException("Empty 'bytecodeClasses' array") } diff --git a/src/main/kotlin/com/koresframework/kores/bytecode/classloader/LoadedBytecodeClass.kt b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/LoadedBytecodeClass.kt new file mode 100644 index 0000000..4eab8de --- /dev/null +++ b/src/main/kotlin/com/koresframework/kores/bytecode/classloader/LoadedBytecodeClass.kt @@ -0,0 +1,37 @@ +/* + * Kores-BytecodeWriter - Translates Kores Structure to JVM Bytecode + * + * The MIT License (MIT) + * + * Copyright (c) 2021 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/) + * Copyright (c) contributors + * + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.koresframework.kores.bytecode.classloader + +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.BytecodeClass + +data class LoadedBytecodeClass( + val bytecodeClass: BytecodeClass, + val outerType: () -> LoadedBytecodeClass?, + val loadedClass: Class<*> +) \ No newline at end of file diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Flow.kt b/src/main/kotlin/com/koresframework/kores/bytecode/common/Flow.kt similarity index 95% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Flow.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/common/Flow.kt index ef168e7..2ea2385 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Flow.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/common/Flow.kt @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.common +package com.koresframework.kores.bytecode.common import org.objectweb.asm.Label import java.time.Instant -import com.github.jonathanxd.kores.base.Label as CodeLabel +import com.koresframework.kores.base.Label as CodeLabel /** * A class that hold information about the flow of the code. diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Frame.kt b/src/main/kotlin/com/koresframework/kores/bytecode/common/Frame.kt similarity index 98% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Frame.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/common/Frame.kt index 5f2d422..7fcf325 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Frame.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/common/Frame.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.common +package com.koresframework.kores.bytecode.common -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.type.`is` +import com.koresframework.kores.Types +import com.koresframework.kores.type.`is` import org.objectweb.asm.Label import java.lang.reflect.Type import java.util.* diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/MethodVisitorHelper.kt b/src/main/kotlin/com/koresframework/kores/bytecode/common/MethodVisitorHelper.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/MethodVisitorHelper.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/common/MethodVisitorHelper.kt index e10a1d6..30af4e8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/MethodVisitorHelper.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/common/MethodVisitorHelper.kt @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.common +package com.koresframework.kores.bytecode.common -import com.github.jonathanxd.kores.type.GenericType -import com.github.jonathanxd.kores.util.descriptor -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.type.GenericType +import com.koresframework.kores.util.descriptor +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.map.ListHashMap import org.objectweb.asm.Label import org.objectweb.asm.MethodVisitor diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Timed.kt b/src/main/kotlin/com/koresframework/kores/bytecode/common/Timed.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Timed.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/common/Timed.kt index 87a905d..ddfa715 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Timed.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/common/Timed.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.common +package com.koresframework.kores.bytecode.common import java.time.Instant diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Variable.kt b/src/main/kotlin/com/koresframework/kores/bytecode/common/Variable.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Variable.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/common/Variable.kt index ceee822..a7ea656 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/common/Variable.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/common/Variable.kt @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.common +package com.koresframework.kores.bytecode.common -import com.github.jonathanxd.kores.type.`is` +import com.koresframework.kores.type.`is` import com.github.jonathanxd.iutils.string.ToStringHelper import org.objectweb.asm.Label import java.lang.reflect.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/Doc.kt b/src/main/kotlin/com/koresframework/kores/bytecode/doc/Doc.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/Doc.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/doc/Doc.kt index 9261909..0651981 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/Doc.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/doc/Doc.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.doc +package com.koresframework.kores.bytecode.doc import com.github.jonathanxd.iutils.option.Options diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyConcatLogic.kt b/src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyConcatLogic.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyConcatLogic.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyConcatLogic.kt index e92d26e..502a4f8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyConcatLogic.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyConcatLogic.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.doc +package com.koresframework.kores.bytecode.doc -import com.github.jonathanxd.kores.bytecode.GENERATE_NESTS -import com.github.jonathanxd.kores.bytecode.GENERATE_SYNTHETIC_ACCESS +import com.koresframework.kores.bytecode.GENERATE_NESTS +import com.koresframework.kores.bytecode.GENERATE_SYNTHETIC_ACCESS /** * Java 9 introduced [JEP 280](https://openjdk.java.net/jeps/280), which is a JDK Enhancement Proposal around diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyGenerationLogic.kt b/src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyGenerationLogic.kt similarity index 99% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyGenerationLogic.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyGenerationLogic.kt index de66532..aa99f85 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/IndyGenerationLogic.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/doc/IndyGenerationLogic.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.doc +package com.koresframework.kores.bytecode.doc import java.lang.invoke.LambdaMetafactory import java.lang.invoke.CallSite diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/NestLogic.kt b/src/main/kotlin/com/koresframework/kores/bytecode/doc/NestLogic.kt similarity index 95% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/NestLogic.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/doc/NestLogic.kt index 80e4f4e..464b7cb 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/doc/NestLogic.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/doc/NestLogic.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.doc +package com.koresframework.kores.bytecode.doc -import com.github.jonathanxd.kores.bytecode.GENERATE_NESTS -import com.github.jonathanxd.kores.bytecode.GENERATE_SYNTHETIC_ACCESS +import com.koresframework.kores.bytecode.GENERATE_NESTS +import com.koresframework.kores.bytecode.GENERATE_SYNTHETIC_ACCESS /** * [Nest-Based Access Control](https://openjdk.java.net/jeps/181) is a [Java 11 feature](https://openjdk.java.net/projects/jdk/11/) diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/exception/ClassCheckException.kt b/src/main/kotlin/com/koresframework/kores/bytecode/exception/ClassCheckException.kt similarity index 85% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/exception/ClassCheckException.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/exception/ClassCheckException.kt index 57a98da..347e1dd 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/exception/ClassCheckException.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/exception/ClassCheckException.kt @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.exception +package com.koresframework.kores.bytecode.exception -import com.github.jonathanxd.kores.bytecode.BytecodeClass +import com.koresframework.kores.bytecode.BytecodeClass class ClassCheckException( message: String, cause: Throwable, - val bytecodeClasses: List, - val failedBytecodeClass: com.github.jonathanxd.kores.bytecode.BytecodeClass + val bytecodeClasses: List, + val failedBytecodeClass: com.koresframework.kores.bytecode.BytecodeClass ) : RuntimeException(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Dup.kt b/src/main/kotlin/com/koresframework/kores/bytecode/extra/Dup.kt similarity index 91% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Dup.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/extra/Dup.kt index 6e0aa82..95ad35e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Dup.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/extra/Dup.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.extra +package com.koresframework.kores.bytecode.extra -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.KoresPart -import com.github.jonathanxd.kores.base.Typed -import com.github.jonathanxd.kores.typeOrNull +import com.koresframework.kores.Instruction +import com.koresframework.kores.KoresPart +import com.koresframework.kores.base.Typed +import com.koresframework.kores.typeOrNull import java.lang.reflect.Type /** diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Pop.kt b/src/main/kotlin/com/koresframework/kores/bytecode/extra/Pop.kt similarity index 94% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Pop.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/extra/Pop.kt index c6ac031..09f60b8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/extra/Pop.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/extra/Pop.kt @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.extra +package com.koresframework.kores.bytecode.extra -import com.github.jonathanxd.kores.Instruction +import com.koresframework.kores.Instruction /** * CodeAPI-BytecodeWriter Pop part. This part will pop the stack value. diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/DeadCodeRemover.kt b/src/main/kotlin/com/koresframework/kores/bytecode/post/DeadCodeRemover.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/DeadCodeRemover.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/post/DeadCodeRemover.kt index 7990dd2..c310433 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/DeadCodeRemover.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/post/DeadCodeRemover.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.post +package com.koresframework.kores.bytecode.post import org.objectweb.asm.tree.LabelNode import org.objectweb.asm.tree.MethodNode diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/GotoOptimizer.kt b/src/main/kotlin/com/koresframework/kores/bytecode/post/GotoOptimizer.kt similarity index 98% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/GotoOptimizer.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/post/GotoOptimizer.kt index 1720dd4..8e8bd4c 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/GotoOptimizer.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/post/GotoOptimizer.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.post +package com.koresframework.kores.bytecode.post import org.objectweb.asm.Opcodes import org.objectweb.asm.tree.AbstractInsnNode diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/MethodProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/post/MethodProcessor.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/MethodProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/post/MethodProcessor.kt index 53fa113..aab4fd8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/MethodProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/post/MethodProcessor.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.post +package com.koresframework.kores.bytecode.post import org.objectweb.asm.tree.MethodNode diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/PostProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/post/PostProcessor.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/PostProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/post/PostProcessor.kt index 8e881a4..a61b268 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/PostProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/post/PostProcessor.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.post +package com.koresframework.kores.bytecode.post /** * Processor run after bytecode generation. diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/Processor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/post/Processor.kt similarity index 98% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/Processor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/post/Processor.kt index a110f3d..60c0886 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/post/Processor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/post/Processor.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.post +package com.koresframework.kores.bytecode.post import org.objectweb.asm.ClassReader import org.objectweb.asm.ClassWriter diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/pre/GenLineVisitor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/pre/GenLineVisitor.kt similarity index 93% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/pre/GenLineVisitor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/pre/GenLineVisitor.kt index 5abed54..25774c8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/pre/GenLineVisitor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/pre/GenLineVisitor.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.pre +package com.koresframework.kores.bytecode.pre -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.KoresPart -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.MutableInstructions -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.util.asmConstValue -import com.github.jonathanxd.kores.factory.line +import com.koresframework.kores.Instruction +import com.koresframework.kores.KoresPart +import com.koresframework.kores.Instructions +import com.koresframework.kores.MutableInstructions +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.util.asmConstValue +import com.koresframework.kores.factory.line import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.typedKeyOf diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/BytecodeGenerator.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/BytecodeGenerator.kt similarity index 87% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/BytecodeGenerator.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/BytecodeGenerator.kt index c21c812..f7afd6a 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/BytecodeGenerator.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/BytecodeGenerator.kt @@ -25,24 +25,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor - -import com.github.jonathanxd.kores.* -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.base.Annotation -import com.github.jonathanxd.kores.bytecode.* -import com.github.jonathanxd.kores.bytecode.exception.ClassCheckException -import com.github.jonathanxd.kores.bytecode.extra.Dup -import com.github.jonathanxd.kores.bytecode.extra.Pop -import com.github.jonathanxd.kores.bytecode.post.Processor -import com.github.jonathanxd.kores.bytecode.processor.processors.* -import com.github.jonathanxd.kores.bytecode.util.ASM_API -import com.github.jonathanxd.kores.common.Stack -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.AbstractProcessorManager -import com.github.jonathanxd.kores.processor.ValidatorManager -import com.github.jonathanxd.kores.processor.VoidValidatorManager +package com.koresframework.kores.bytecode.processor + +import com.koresframework.kores.* +import com.koresframework.kores.base.* +import com.koresframework.kores.base.Annotation +import com.koresframework.kores.bytecode.* +import com.koresframework.kores.bytecode.exception.ClassCheckException +import com.koresframework.kores.bytecode.extra.Dup +import com.koresframework.kores.bytecode.extra.Pop +import com.koresframework.kores.bytecode.post.Processor +import com.koresframework.kores.bytecode.processor.processors.* +import com.koresframework.kores.bytecode.util.ASM_API +import com.koresframework.kores.common.Stack +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.AbstractProcessorManager +import com.koresframework.kores.processor.ValidatorManager +import com.koresframework.kores.processor.VoidValidatorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.option.Options import org.objectweb.asm.ClassReader @@ -58,7 +58,7 @@ class BytecodeGenerator @JvmOverloads constructor( } } ) //CodeAPI Instructions - : AbstractProcessorManager>() { + : AbstractProcessorManager>() { override val options: Options = Options() @@ -195,11 +195,11 @@ class BytecodeGenerator @JvmOverloads constructor( return data } - override fun process(part: Any): List { + override fun process(part: Any): List { return super.process(LineProcessor.visitLineICT(part, this)) } - override fun process(type: Class, part: T, data: TypedData): List { + override fun process(type: Class, part: T, data: TypedData): List { LineProcessor.visitLineIC(this, data) val processor = getProcessorOf(type, part, data) @@ -211,12 +211,12 @@ class BytecodeGenerator @JvmOverloads constructor( } // Called by version above. - override fun getFinalValue(data: TypedData): List { + override fun getFinalValue(data: TypedData): List { val classes = BYTECODE_CLASS_LIST.getOrNull(data) ?: mutableListOf() val checkClasses = if (this.options[POST_PROCESSING]) { classes.map { - com.github.jonathanxd.kores.bytecode.BytecodeClass( + com.koresframework.kores.bytecode.BytecodeClass( it.declaration, try { Processor( @@ -239,7 +239,7 @@ class BytecodeGenerator @JvmOverloads constructor( return checkClasses } - private fun check(classes: List) { + private fun check(classes: List) { if (this.options[CHECK]) { if (classes.isNotEmpty()) { classes.forEach { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/Keys.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/Keys.kt similarity index 89% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/Keys.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/Keys.kt index 5c5de45..666a103 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/Keys.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/Keys.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor - -import com.github.jonathanxd.kores.KoresElement -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.common.Flow -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.common.Timed -import com.github.jonathanxd.kores.bytecode.util.AnnotationVisitorCapable -import com.github.jonathanxd.kores.common.FieldRef -import com.github.jonathanxd.kores.factory.invoke -import com.github.jonathanxd.kores.processor.ProcessorManager +package com.koresframework.kores.bytecode.processor + +import com.koresframework.kores.KoresElement +import com.koresframework.kores.Instruction +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.common.Flow +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.common.Timed +import com.koresframework.kores.bytecode.util.AnnotationVisitorCapable +import com.koresframework.kores.common.FieldRef +import com.koresframework.kores.factory.invoke +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.`object`.TypedKey import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.containsKey @@ -111,7 +111,7 @@ val C_LINE = typedKeyOf>("CURRENT_LINE") data class CLine(val line: Int, val label: Label) // List -val BYTECODE_CLASS_LIST = typedKeyOf>("BYTECODE_CLASS_LIST") +val BYTECODE_CLASS_LIST = typedKeyOf>("BYTECODE_CLASS_LIST") val CLASS_VERSION = typedKeyOf("CLASS_VERSION") diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AccessProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AccessProcessor.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AccessProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AccessProcessor.kt index 585f7a9..97df545 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AccessProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AccessProcessor.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Access -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.Access +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotableProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotableProcessor.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotableProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotableProcessor.kt index 34d8c2d..d536519 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotableProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotableProcessor.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Annotable -import com.github.jonathanxd.kores.base.Annotation -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.Annotable +import com.koresframework.kores.base.Annotation +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData object AnnotableProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationProcessor.kt index d325738..8c19a03 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Annotation -import com.github.jonathanxd.kores.base.Retention -import com.github.jonathanxd.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE -import com.github.jonathanxd.kores.bytecode.util.AnnotationUtil -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.Annotation +import com.koresframework.kores.base.Retention +import com.koresframework.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE +import com.koresframework.kores.bytecode.util.AnnotationUtil +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData object AnnotationProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt similarity index 79% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt index 5626196..63092fb 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/AnnotationPropertyProcessor.kt @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Annotable -import com.github.jonathanxd.kores.base.AnnotationProperty -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE -import com.github.jonathanxd.kores.bytecode.processor.CLASS_VISITOR -import com.github.jonathanxd.kores.bytecode.util.AnnotationUtil -import com.github.jonathanxd.kores.bytecode.util.AnnotationVisitorCapable -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.Annotable +import com.koresframework.kores.base.AnnotationProperty +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE +import com.koresframework.kores.bytecode.processor.CLASS_VISITOR +import com.koresframework.kores.bytecode.util.AnnotationUtil +import com.koresframework.kores.bytecode.util.AnnotationVisitorCapable +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.inContext import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt index 97d1a2a..f034732 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArgumentsHolderProcessor.kt @@ -25,22 +25,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.ArgumentsHolder -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.IN_INVOKE_DYNAMIC -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.InsnUtil -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.isPrimitive -import com.github.jonathanxd.kores.typeOrNull +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.ArgumentsHolder +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.IN_INVOKE_DYNAMIC +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.InsnUtil +import com.koresframework.kores.factory.cast +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.isPrimitive +import com.koresframework.kores.typeOrNull import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.type.koresType +import com.koresframework.kores.type.koresType object ArgumentsHolderProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayAccessProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayAccessProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayAccessProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayAccessProcessor.kt index 44f7d6b..23f45bf 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayAccessProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayAccessProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArrayAccess -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.ArrayAccess +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayConstructProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayConstructProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayConstructProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayConstructProcessor.kt index cbe9ace..087ecc8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayConstructProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayConstructProcessor.kt @@ -25,20 +25,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArrayConstructor -import com.github.jonathanxd.kores.base.ArrayStore -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.ArrayUtil -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.arrayComponent -import com.github.jonathanxd.kores.type.arrayDimension -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.ArrayConstructor +import com.koresframework.kores.base.ArrayStore +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.ArrayUtil +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.arrayComponent +import com.koresframework.kores.type.arrayDimension +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLengthProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLengthProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLengthProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLengthProcessor.kt index ed28958..7e5e650 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLengthProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLengthProcessor.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArrayAccess -import com.github.jonathanxd.kores.base.ArrayLength -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.ArrayAccess +import com.koresframework.kores.base.ArrayLength +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLoadProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLoadProcessor.kt similarity index 77% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLoadProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLoadProcessor.kt index 342c102..057c34b 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayLoadProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayLoadProcessor.kt @@ -25,20 +25,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArrayAccess -import com.github.jonathanxd.kores.base.ArrayLoad -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.CodeTypeUtil -import com.github.jonathanxd.kores.common.Stack -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.arrayComponent +import com.koresframework.kores.base.ArrayAccess +import com.koresframework.kores.base.ArrayLoad +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.CodeTypeUtil +import com.koresframework.kores.common.Stack +import com.koresframework.kores.factory.cast +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.arrayComponent import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayStoreProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayStoreProcessor.kt similarity index 79% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayStoreProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayStoreProcessor.kt index b3e2c63..3cd4a80 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ArrayStoreProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ArrayStoreProcessor.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArrayAccess -import com.github.jonathanxd.kores.base.ArrayStore -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.CodeTypeUtil -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.arrayComponent +import com.koresframework.kores.base.ArrayAccess +import com.koresframework.kores.base.ArrayStore +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.CodeTypeUtil +import com.koresframework.kores.factory.cast +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.arrayComponent import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt index e3dfcb6..1a978d9 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/BytecodeIfStatementHelper.kt @@ -25,28 +25,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.* -import com.github.jonathanxd.kores.base.IfExpr -import com.github.jonathanxd.kores.base.IfGroup -import com.github.jonathanxd.kores.base.IfStatement -import com.github.jonathanxd.kores.base.Line -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.IfUtil -import com.github.jonathanxd.kores.bytecode.util.OperatorUtil -import com.github.jonathanxd.kores.bytecode.util.booleanValue -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.operator.Operator -import com.github.jonathanxd.kores.operator.Operators -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.processor.processAs -import com.github.jonathanxd.kores.type.`is` +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.* +import com.koresframework.kores.base.IfExpr +import com.koresframework.kores.base.IfGroup +import com.koresframework.kores.base.IfStatement +import com.koresframework.kores.base.Line +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.IfUtil +import com.koresframework.kores.bytecode.util.OperatorUtil +import com.koresframework.kores.bytecode.util.booleanValue +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.factory.cast +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.operator.Operator +import com.koresframework.kores.operator.Operators +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.processor.processAs +import com.koresframework.kores.type.`is` import com.github.jonathanxd.iutils.data.TypedData import org.objectweb.asm.Label import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/CastProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/CastProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/CastProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/CastProcessor.kt index 48fa3ec..d792cf8 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/CastProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/CastProcessor.kt @@ -25,24 +25,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.KoresPart -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.Cast -import com.github.jonathanxd.kores.base.TypeSpec -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.CodeTypeUtil -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.factory.constructorTypeSpec -import com.github.jonathanxd.kores.factory.invokeConstructor -import com.github.jonathanxd.kores.factory.invokeVirtual -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.* +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instruction +import com.koresframework.kores.KoresPart +import com.koresframework.kores.Types +import com.koresframework.kores.base.Cast +import com.koresframework.kores.base.TypeSpec +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.CodeTypeUtil +import com.koresframework.kores.factory.cast +import com.koresframework.kores.factory.constructorTypeSpec +import com.koresframework.kores.factory.invokeConstructor +import com.koresframework.kores.factory.invokeVirtual +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.* import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ConcatProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ConcatProcessor.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ConcatProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ConcatProcessor.kt index 82b95cc..78e0305 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ConcatProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ConcatProcessor.kt @@ -25,34 +25,34 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.factory.constructorTypeSpec -import com.github.jonathanxd.kores.factory.invokeConstructor -import com.github.jonathanxd.kores.factory.invokeVirtual -import com.github.jonathanxd.kores.factory.typeSpec -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Types +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.factory.constructorTypeSpec +import com.koresframework.kores.factory.invokeConstructor +import com.koresframework.kores.factory.invokeVirtual +import com.koresframework.kores.factory.typeSpec +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.INDY_CONCAT_STRATEGY -import com.github.jonathanxd.kores.bytecode.IndyConcatStrategy -import com.github.jonathanxd.kores.bytecode.processor.indifyEnabled -import com.github.jonathanxd.kores.common.DynamicMethodSpec -import com.github.jonathanxd.kores.common.MethodInvokeSpec -import com.github.jonathanxd.kores.common.MethodTypeSpec -import com.github.jonathanxd.kores.common.Stack -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.type -import com.github.jonathanxd.kores.type.* +import com.koresframework.kores.Instruction +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.INDY_CONCAT_STRATEGY +import com.koresframework.kores.bytecode.IndyConcatStrategy +import com.koresframework.kores.bytecode.processor.indifyEnabled +import com.koresframework.kores.common.DynamicMethodSpec +import com.koresframework.kores.common.MethodInvokeSpec +import com.koresframework.kores.common.MethodTypeSpec +import com.koresframework.kores.common.Stack +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.type +import com.koresframework.kores.type.* import java.lang.invoke.CallSite import java.lang.invoke.MethodHandles import java.lang.invoke.MethodType diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ControlFlowProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ControlFlowProcessor.kt similarity index 88% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ControlFlowProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ControlFlowProcessor.kt index 9f728f4..3f7bc49 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ControlFlowProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ControlFlowProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ControlFlow -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.TRY_BLOCK_DATA -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.ControlFlow +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.TRY_BLOCK_DATA +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/DupProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/DupProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/DupProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/DupProcessor.kt index b37a167..30e950a 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/DupProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/DupProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.bytecode.extra.Dup -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.bytecode.extra.Dup +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ElementsHolderProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ElementsHolderProcessor.kt similarity index 89% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ElementsHolderProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ElementsHolderProcessor.kt index df3b125..ceaa665 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ElementsHolderProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ElementsHolderProcessor.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.builder.build -import com.github.jonathanxd.kores.bytecode.processor.LOCATION -import com.github.jonathanxd.kores.factory.constructorDec -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.processor.processAs +import com.koresframework.kores.base.* +import com.koresframework.kores.builder.build +import com.koresframework.kores.bytecode.processor.LOCATION +import com.koresframework.kores.factory.constructorDec +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.processor.processAs import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.inContext diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt index b19eaca..d126e90 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/EnumDeclarationProcessor.kt @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.EnumDeclaration -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.bytecode.util.EnumUtil -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.EnumDeclaration +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.util.EnumUtil +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData object EnumDeclarationProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldAccessProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldAccessProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldAccessProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldAccessProcessor.kt index 52fa57d..3e08e82 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldAccessProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldAccessProcessor.kt @@ -25,20 +25,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Access -import com.github.jonathanxd.kores.base.FieldAccess -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.KoresType -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.Access +import com.koresframework.kores.base.FieldAccess +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.KoresType +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.bytecode.isSyntheticAccess -import com.github.jonathanxd.kores.bytecode.nestAccessGenerationMode -import com.github.jonathanxd.kores.bytecode.processor.* +import com.koresframework.kores.bytecode.isSyntheticAccess +import com.koresframework.kores.bytecode.nestAccessGenerationMode +import com.koresframework.kores.bytecode.processor.* import org.objectweb.asm.Opcodes object FieldAccessProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt similarity index 73% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt index 5f881b0..8a7e08e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDeclarationProcessor.kt @@ -25,24 +25,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Annotable -import com.github.jonathanxd.kores.base.KoresModifier -import com.github.jonathanxd.kores.base.FieldDeclaration -import com.github.jonathanxd.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE -import com.github.jonathanxd.kores.bytecode.processor.CLASS_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.TYPE_DECLARATION -import com.github.jonathanxd.kores.bytecode.util.AnnotationVisitorCapable -import com.github.jonathanxd.kores.bytecode.util.ModifierUtil -import com.github.jonathanxd.kores.bytecode.util.asmConstValue -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.GenericType -import com.github.jonathanxd.kores.util.descriptor -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.Annotable +import com.koresframework.kores.base.KoresModifier +import com.koresframework.kores.base.FieldDeclaration +import com.koresframework.kores.bytecode.processor.ANNOTATION_VISITOR_CAPABLE +import com.koresframework.kores.bytecode.processor.CLASS_VISITOR +import com.koresframework.kores.bytecode.processor.TYPE_DECLARATION +import com.koresframework.kores.bytecode.util.AnnotationVisitorCapable +import com.koresframework.kores.bytecode.util.ModifierUtil +import com.koresframework.kores.bytecode.util.asmConstValue +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.GenericType +import com.koresframework.kores.util.descriptor +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData -import com.github.jonathanxd.kores.util.descriptorDiscardBound +import com.koresframework.kores.util.descriptorDiscardBound object FieldDeclarationProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt index 2aebe9d..c486920 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/FieldDefinitionProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.Access -import com.github.jonathanxd.kores.base.FieldDefinition -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.Access +import com.koresframework.kores.base.FieldDefinition +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForEachProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForEachProcessor.kt similarity index 91% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForEachProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForEachProcessor.kt index 9e286ae..04e06e5 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForEachProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForEachProcessor.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.factory.* -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.operator.Operators -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.Types +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.factory.* +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.operator.Operators +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForStatementProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForStatementProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForStatementProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForStatementProcessor.kt index 7ef1479..e8a0526 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ForStatementProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ForStatementProcessor.kt @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.MutableInstructions -import com.github.jonathanxd.kores.base.ForStatement -import com.github.jonathanxd.kores.base.IfStatement -import com.github.jonathanxd.kores.bytecode.common.Flow -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.MutableInstructions +import com.koresframework.kores.base.ForStatement +import com.koresframework.kores.base.IfStatement +import com.koresframework.kores.bytecode.common.Flow +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfExprProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfExprProcessor.kt similarity index 80% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfExprProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfExprProcessor.kt index d0f678b..5b5ed70 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfExprProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfExprProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.IfExpr -import com.github.jonathanxd.kores.base.IfStatement -import com.github.jonathanxd.kores.factory.ifExprs -import com.github.jonathanxd.kores.factory.ifStatement -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.IfExpr +import com.koresframework.kores.base.IfStatement +import com.koresframework.kores.factory.ifExprs +import com.koresframework.kores.factory.ifStatement +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager object IfExprProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfStatementProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfStatementProcessor.kt similarity index 88% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfStatementProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfStatementProcessor.kt index 5c8f808..1968f8a 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/IfStatementProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/IfStatementProcessor.kt @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.IfStatement -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.IfStatement +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import org.objectweb.asm.Label import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstanceOfProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstanceOfProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstanceOfProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstanceOfProcessor.kt index 0d91c7a..1216e54 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstanceOfProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstanceOfProcessor.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.InstanceOfCheck -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.internalName +import com.koresframework.kores.base.InstanceOfCheck +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.internalName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionCodePart.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionCodePart.kt similarity index 91% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionCodePart.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionCodePart.kt index 0005e72..8d5e11e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionCodePart.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionCodePart.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.Instruction +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager interface InstructionCodePart : Instruction { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionsProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionsProcessor.kt similarity index 89% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionsProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionsProcessor.kt index 91ff6bb..147ee87 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InstructionsProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InstructionsProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.Instructions +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager object InstructionsProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt index 852d04a..8762a2a 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.ArgumentsHolder -import com.github.jonathanxd.kores.base.InvokeDynamicBase -import com.github.jonathanxd.kores.base.LocalCode -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.util.MethodInvocationUtil -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.`is` +import com.koresframework.kores.base.ArgumentsHolder +import com.koresframework.kores.base.InvokeDynamicBase +import com.koresframework.kores.base.LocalCode +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.util.MethodInvocationUtil +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.`is` import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LabelProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LabelProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LabelProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LabelProcessor.kt index 6ee9361..6432eb0 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LabelProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LabelProcessor.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.bytecode.common.Flow -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.Instructions +import com.koresframework.kores.bytecode.common.Flow +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import org.objectweb.asm.Label -import com.github.jonathanxd.kores.base.Label as CodeLabel +import com.koresframework.kores.base.Label as CodeLabel object LabelProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LineProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LineProcessor.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LineProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LineProcessor.kt index e50a2c2..3892626 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LineProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LineProcessor.kt @@ -25,23 +25,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require import com.github.jonathanxd.iutils.kt.typedKeyOf -import com.github.jonathanxd.kores.KoresPart -import com.github.jonathanxd.kores.base.Line -import com.github.jonathanxd.kores.bytecode.VISIT_LINES -import com.github.jonathanxd.kores.bytecode.VisitLineType -import com.github.jonathanxd.kores.bytecode.pre.GenLineVisitor -import com.github.jonathanxd.kores.bytecode.processor.CLine -import com.github.jonathanxd.kores.bytecode.processor.C_LINE -import com.github.jonathanxd.kores.bytecode.processor.LINE -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.KoresPart +import com.koresframework.kores.base.Line +import com.koresframework.kores.bytecode.VISIT_LINES +import com.koresframework.kores.bytecode.VisitLineType +import com.koresframework.kores.bytecode.pre.GenLineVisitor +import com.koresframework.kores.bytecode.processor.CLine +import com.koresframework.kores.bytecode.processor.C_LINE +import com.koresframework.kores.bytecode.processor.LINE +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import org.objectweb.asm.Label object LineProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LiteralProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LiteralProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LiteralProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LiteralProcessor.kt index eb3745a..d52086c 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LiteralProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LiteralProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.util.LiteralUtil -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.util.LiteralUtil +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LocalCodeProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LocalCodeProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LocalCodeProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LocalCodeProcessor.kt index adcaa29..3a833c9 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/LocalCodeProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LocalCodeProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.LocalCode -import com.github.jonathanxd.kores.base.MethodDeclaration -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.base.LocalCode +import com.koresframework.kores.base.MethodDeclaration +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt similarity index 89% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt index 00cd6de..500c772 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodDeclarationProcessor.kt @@ -25,26 +25,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.GENERATE_BRIDGE_METHODS -import com.github.jonathanxd.kores.bytecode.VALIDATE_SUPER -import com.github.jonathanxd.kores.bytecode.VALIDATE_THIS -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.common.Variable -import com.github.jonathanxd.kores.bytecode.processor.* -import com.github.jonathanxd.kores.bytecode.util.* -import com.github.jonathanxd.kores.bytecode.util.asm.ParameterVisitor -import com.github.jonathanxd.kores.insertAfter -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.internalName -import com.github.jonathanxd.kores.util.methodGenericSignature -import com.github.jonathanxd.kores.util.parametersAndReturnToInferredDesc -import com.github.jonathanxd.kores.util.typeDesc +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.GENERATE_BRIDGE_METHODS +import com.koresframework.kores.bytecode.VALIDATE_SUPER +import com.koresframework.kores.bytecode.VALIDATE_THIS +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.common.Variable +import com.koresframework.kores.bytecode.processor.* +import com.koresframework.kores.bytecode.util.* +import com.koresframework.kores.bytecode.util.asm.ParameterVisitor +import com.koresframework.kores.insertAfter +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.internalName +import com.koresframework.kores.util.methodGenericSignature +import com.koresframework.kores.util.parametersAndReturnToInferredDesc +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.inContext diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodInvocationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodInvocationProcessor.kt similarity index 87% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodInvocationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodInvocationProcessor.kt index dcec8c8..6ca11b2 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/MethodInvocationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/MethodInvocationProcessor.kt @@ -25,23 +25,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.util.InvokeTypeUtil -import com.github.jonathanxd.kores.factory.invokeConstructor -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.internalName -import com.github.jonathanxd.kores.type.isInterface +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.util.InvokeTypeUtil +import com.koresframework.kores.factory.invokeConstructor +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.internalName +import com.koresframework.kores.type.isInterface import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.bytecode.isSyntheticAccess -import com.github.jonathanxd.kores.bytecode.nestAccessGenerationMode -import com.github.jonathanxd.kores.bytecode.processor.* -import com.github.jonathanxd.kores.type.KoresType +import com.koresframework.kores.bytecode.isSyntheticAccess +import com.koresframework.kores.bytecode.nestAccessGenerationMode +import com.koresframework.kores.bytecode.processor.* +import com.koresframework.kores.type.KoresType import org.objectweb.asm.Opcodes import java.lang.reflect.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt index 88fa909..341fd88 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ModuleDeclarationProcessor.kt @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.ModuleDeclaration -import com.github.jonathanxd.kores.bytecode.BytecodeClass -import com.github.jonathanxd.kores.bytecode.processor.BYTECODE_CLASS_LIST -import com.github.jonathanxd.kores.bytecode.processor.SOURCE_FILE_FUNCTION -import com.github.jonathanxd.kores.bytecode.util.ModifierUtil -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.internalName +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.ModuleDeclaration +import com.koresframework.kores.bytecode.BytecodeClass +import com.koresframework.kores.bytecode.processor.BYTECODE_CLASS_LIST +import com.koresframework.kores.bytecode.processor.SOURCE_FILE_FUNCTION +import com.koresframework.kores.bytecode.util.ModifierUtil +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.internalName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import org.objectweb.asm.ClassWriter @@ -109,7 +109,7 @@ object ModuleDeclarationProcessor : Processor { cw.visitEnd() BYTECODE_CLASS_LIST.add(data, - com.github.jonathanxd.kores.bytecode.BytecodeClass(part, cw.toByteArray()) + com.koresframework.kores.bytecode.BytecodeClass(part, cw.toByteArray()) ) } } \ No newline at end of file diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/NewProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/NewProcessor.kt similarity index 84% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/NewProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/NewProcessor.kt index bf2dbb1..6d8f830 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/NewProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/NewProcessor.kt @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.New -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.internalName +import com.koresframework.kores.base.New +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.internalName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/OperateProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/OperateProcessor.kt similarity index 83% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/OperateProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/OperateProcessor.kt index d0e26e5..2cff971 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/OperateProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/OperateProcessor.kt @@ -25,24 +25,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.Operate -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.ReflectType -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.helper.OperateHelper -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.operator.Operator -import com.github.jonathanxd.kores.operator.Operators -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type -import com.github.jonathanxd.kores.type.javaSpecName +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.Operate +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.ReflectType +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.helper.OperateHelper +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.operator.Operator +import com.koresframework.kores.operator.Operators +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type +import com.koresframework.kores.type.javaSpecName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/PopProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/PopProcessor.kt similarity index 85% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/PopProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/PopProcessor.kt index fcce128..f653729 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/PopProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/PopProcessor.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.bytecode.extra.Pop -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.bytecode.extra.Pop +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ReturnProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ReturnProcessor.kt similarity index 81% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ReturnProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ReturnProcessor.kt index 5dee692..85e046b 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ReturnProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ReturnProcessor.kt @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.Return -import com.github.jonathanxd.kores.base.VariableDeclaration -import com.github.jonathanxd.kores.bytecode.processor.* -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.common.Void -import com.github.jonathanxd.kores.factory.accessVariable -import com.github.jonathanxd.kores.factory.variable -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.javaSpecName +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Types +import com.koresframework.kores.base.Return +import com.koresframework.kores.base.VariableDeclaration +import com.koresframework.kores.bytecode.processor.* +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.common.Void +import com.koresframework.kores.factory.accessVariable +import com.koresframework.kores.factory.variable +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.javaSpecName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.factory.cast -import com.github.jonathanxd.kores.typeOrNull +import com.koresframework.kores.factory.cast +import com.koresframework.kores.typeOrNull import org.objectweb.asm.Label import org.objectweb.asm.Opcodes import org.objectweb.asm.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ScopeAccessProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ScopeAccessProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ScopeAccessProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ScopeAccessProcessor.kt index 565819d..825b525 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ScopeAccessProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ScopeAccessProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.processor.OUTER_TYPE_FIELD -import com.github.jonathanxd.kores.bytecode.processor.OuterClassField -import com.github.jonathanxd.kores.bytecode.processor.TYPE_DECLARATION -import com.github.jonathanxd.kores.factory.accessField -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.`is` +import com.koresframework.kores.Instruction +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.processor.OUTER_TYPE_FIELD +import com.koresframework.kores.bytecode.processor.OuterClassField +import com.koresframework.kores.bytecode.processor.TYPE_DECLARATION +import com.koresframework.kores.factory.accessField +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.`is` import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StackProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StackProcessor.kt similarity index 85% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StackProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StackProcessor.kt index 05975d5..d9f281d 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StackProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StackProcessor.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.common.Stack -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.common.Stack +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StaticBlockProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StaticBlockProcessor.kt similarity index 78% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StaticBlockProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StaticBlockProcessor.kt index 2733a8f..c83fcc6 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/StaticBlockProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/StaticBlockProcessor.kt @@ -25,23 +25,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.MutableInstructions -import com.github.jonathanxd.kores.base.Access -import com.github.jonathanxd.kores.base.KoresModifier -import com.github.jonathanxd.kores.base.StaticBlock -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.processor.CLASS_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.TYPE_DECLARATION -import com.github.jonathanxd.kores.bytecode.util.asmConstValue -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.factory.setFieldValue -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.MutableInstructions +import com.koresframework.kores.base.Access +import com.koresframework.kores.base.KoresModifier +import com.koresframework.kores.base.StaticBlock +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.processor.CLASS_VISITOR +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.TYPE_DECLARATION +import com.koresframework.kores.bytecode.util.asmConstValue +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.factory.setFieldValue +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.inContext import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SwitchProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SwitchProcessor.kt similarity index 92% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SwitchProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SwitchProcessor.kt index ce7b6ae..cb7402a 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SwitchProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SwitchProcessor.kt @@ -25,29 +25,29 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.* -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.common.Flow -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.bytecode.util.ReflectType -import com.github.jonathanxd.kores.bytecode.util.SwitchOnEnum -import com.github.jonathanxd.kores.common.MethodTypeSpec -import com.github.jonathanxd.kores.factory.checkTrue -import com.github.jonathanxd.kores.factory.defaultCase -import com.github.jonathanxd.kores.factory.invokeVirtual -import com.github.jonathanxd.kores.factory.typeSpec -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.isPrimitive -import com.github.jonathanxd.kores.type.primitiveType +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.* +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.common.Flow +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.bytecode.util.ReflectType +import com.koresframework.kores.bytecode.util.SwitchOnEnum +import com.koresframework.kores.common.MethodTypeSpec +import com.koresframework.kores.factory.checkTrue +import com.koresframework.kores.factory.defaultCase +import com.koresframework.kores.factory.invokeVirtual +import com.koresframework.kores.factory.typeSpec +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.isPrimitive +import com.koresframework.kores.type.primitiveType import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SynchronizedProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SynchronizedProcessor.kt similarity index 76% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SynchronizedProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SynchronizedProcessor.kt index f69748e..3711696 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/SynchronizedProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/SynchronizedProcessor.kt @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.Synchronized -import com.github.jonathanxd.kores.base.TryStatement -import com.github.jonathanxd.kores.base.VariableAccess -import com.github.jonathanxd.kores.base.VariableDeclaration -import com.github.jonathanxd.kores.bytecode.extra.Dup -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.factory.accessVariable -import com.github.jonathanxd.kores.factory.variable -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.typeOrNull +import com.koresframework.kores.Types +import com.koresframework.kores.base.Synchronized +import com.koresframework.kores.base.TryStatement +import com.koresframework.kores.base.VariableAccess +import com.koresframework.kores.base.VariableDeclaration +import com.koresframework.kores.bytecode.extra.Dup +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.factory.accessVariable +import com.koresframework.kores.factory.variable +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.typeOrNull import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instructions +import com.koresframework.kores.Instructions import org.objectweb.asm.Opcodes object SynchronizedProcessor : Processor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt index b6c4d79..f85d3c3 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ThrowExceptionProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.ThrowException -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.ThrowException +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryStatementProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryStatementProcessor.kt similarity index 88% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryStatementProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryStatementProcessor.kt index 36a22cd..3383144 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryStatementProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryStatementProcessor.kt @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.CatchStatement -import com.github.jonathanxd.kores.base.ThrowException -import com.github.jonathanxd.kores.base.TryStatement -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.TRY_BLOCK_DATA -import com.github.jonathanxd.kores.bytecode.processor.TryBlockData -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.factory.accessVariable -import com.github.jonathanxd.kores.factory.variable -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.internalName -import com.github.jonathanxd.kores.type.koresType +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.CatchStatement +import com.koresframework.kores.base.ThrowException +import com.koresframework.kores.base.TryStatement +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.TRY_BLOCK_DATA +import com.koresframework.kores.bytecode.processor.TryBlockData +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.factory.accessVariable +import com.koresframework.kores.factory.variable +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.internalName +import com.koresframework.kores.type.koresType import org.objectweb.asm.Label import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt similarity index 91% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt index e44a929..987fb3c 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TryWithResourcesProcessor.kt @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.factory.* -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.Types +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.factory.* +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt index 521bc45..66d61ba 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/TypeDeclarationProcessor.kt @@ -25,33 +25,33 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.FORCE_INDIFY_STRING_CONCAT -import com.github.jonathanxd.kores.bytecode.INDIFY_STRING_CONCAT -import com.github.jonathanxd.kores.bytecode.doc.Doc -import com.github.jonathanxd.kores.bytecode.doc.NestLogic -import com.github.jonathanxd.kores.bytecode.isToGenerateNests -import com.github.jonathanxd.kores.bytecode.nestAccessGenerationMode -import com.github.jonathanxd.kores.bytecode.processor.* -import com.github.jonathanxd.kores.bytecode.util.AnnotationVisitorCapable -import com.github.jonathanxd.kores.bytecode.util.ModifierUtil -import com.github.jonathanxd.kores.bytecode.util.SwitchOnEnum -import com.github.jonathanxd.kores.bytecode.util.allInnerTypes -import com.github.jonathanxd.kores.common.FieldRef -import com.github.jonathanxd.kores.common.getNewNameBasedOnNameList -import com.github.jonathanxd.kores.factory.accessVariable -import com.github.jonathanxd.kores.factory.parameter -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.GenericType -import com.github.jonathanxd.kores.type.KoresType -import com.github.jonathanxd.kores.type.koresType -import com.github.jonathanxd.kores.util.genericTypesToDescriptor -import com.github.jonathanxd.kores.util.parametersAndReturnToInferredDesc +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.FORCE_INDIFY_STRING_CONCAT +import com.koresframework.kores.bytecode.INDIFY_STRING_CONCAT +import com.koresframework.kores.bytecode.doc.Doc +import com.koresframework.kores.bytecode.doc.NestLogic +import com.koresframework.kores.bytecode.isToGenerateNests +import com.koresframework.kores.bytecode.nestAccessGenerationMode +import com.koresframework.kores.bytecode.processor.* +import com.koresframework.kores.bytecode.util.AnnotationVisitorCapable +import com.koresframework.kores.bytecode.util.ModifierUtil +import com.koresframework.kores.bytecode.util.SwitchOnEnum +import com.koresframework.kores.bytecode.util.allInnerTypes +import com.koresframework.kores.common.FieldRef +import com.koresframework.kores.common.getNewNameBasedOnNameList +import com.koresframework.kores.factory.accessVariable +import com.koresframework.kores.factory.parameter +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.GenericType +import com.koresframework.kores.type.KoresType +import com.koresframework.kores.type.koresType +import com.koresframework.kores.util.genericTypesToDescriptor +import com.koresframework.kores.util.parametersAndReturnToInferredDesc import org.objectweb.asm.ClassVisitor import org.objectweb.asm.ClassWriter import org.objectweb.asm.Opcodes @@ -309,7 +309,7 @@ object TypeDeclarationProcessor : Processor { BYTECODE_CLASS_LIST.getOrSet(data.mainData, mutableListOf()) .add( at, - com.github.jonathanxd.kores.bytecode.BytecodeClass(localPart, cw.toByteArray()) + com.koresframework.kores.bytecode.BytecodeClass(localPart, cw.toByteArray()) ) TYPES.getOrNull(data)?.removeAll { it.`is`(localPart) } OUTER_TYPE_FIELD.remove(data) diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/Util.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/Util.kt similarity index 94% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/Util.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/Util.kt index 7cd498f..aa8dfc3 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/Util.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/Util.kt @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.KoresElement -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.processor.* -import com.github.jonathanxd.kores.bytecode.util.ReflectType -import com.github.jonathanxd.kores.bytecode.util.allInnerTypes -import com.github.jonathanxd.kores.bytecode.util.allTypes -import com.github.jonathanxd.kores.common.getNewName -import com.github.jonathanxd.kores.common.getNewNameBasedOnNameList -import com.github.jonathanxd.kores.factory.* -import com.github.jonathanxd.kores.type.* -import com.github.jonathanxd.kores.util.conversion.access +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.KoresElement +import com.koresframework.kores.Instruction +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.processor.* +import com.koresframework.kores.bytecode.util.ReflectType +import com.koresframework.kores.bytecode.util.allInnerTypes +import com.koresframework.kores.bytecode.util.allTypes +import com.koresframework.kores.common.getNewName +import com.koresframework.kores.common.getNewNameBasedOnNameList +import com.koresframework.kores.factory.* +import com.koresframework.kores.type.* +import com.koresframework.kores.util.conversion.access import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableAccessProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableAccessProcessor.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableAccessProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableAccessProcessor.kt index e332926..6a80877 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableAccessProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableAccessProcessor.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.VariableAccess -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.type.javaSpecName +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.VariableAccess +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.type.javaSpecName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt similarity index 82% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt index 1f4d9f9..7870229 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDeclarationProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.base.VariableDeclaration -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.javaSpecName +import com.koresframework.kores.base.VariableDeclaration +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.javaSpecName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Label diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt similarity index 83% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt index 3e33b71..368667e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableDefinitionProcessor.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.base.Operate -import com.github.jonathanxd.kores.base.VariableDefinition -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.javaSpecName +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.base.Operate +import com.koresframework.kores.base.VariableDefinition +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.javaSpecName import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.require import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableOperateProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableOperateProcessor.kt similarity index 85% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableOperateProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableOperateProcessor.kt index 51a10e7..2bc2a6e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/VariableOperateProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/VariableOperateProcessor.kt @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors +package com.koresframework.kores.bytecode.processor.processors -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.base.Line -import com.github.jonathanxd.kores.base.Operate -import com.github.jonathanxd.kores.base.VariableAccess -import com.github.jonathanxd.kores.base.VariableDefinition -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.operator.Operators -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.javaSpecName +import com.koresframework.kores.Instruction +import com.koresframework.kores.base.Line +import com.koresframework.kores.base.Operate +import com.koresframework.kores.base.VariableAccess +import com.koresframework.kores.base.VariableDefinition +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.operator.Operators +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.javaSpecName import org.objectweb.asm.Label object VariableOperateProcessor { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/WhileStatementProcessor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/WhileStatementProcessor.kt similarity index 88% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/WhileStatementProcessor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/WhileStatementProcessor.kt index a1b90e2..1277cd9 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/processor/processors/WhileStatementProcessor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/WhileStatementProcessor.kt @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.processor.processors - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.base.IfStatement -import com.github.jonathanxd.kores.base.WhileStatement -import com.github.jonathanxd.kores.bytecode.common.Flow -import com.github.jonathanxd.kores.bytecode.processor.FLOWS -import com.github.jonathanxd.kores.bytecode.processor.METHOD_VISITOR -import com.github.jonathanxd.kores.processor.Processor -import com.github.jonathanxd.kores.processor.ProcessorManager +package com.koresframework.kores.bytecode.processor.processors + +import com.koresframework.kores.Instructions +import com.koresframework.kores.base.IfStatement +import com.koresframework.kores.base.WhileStatement +import com.koresframework.kores.bytecode.common.Flow +import com.koresframework.kores.bytecode.processor.FLOWS +import com.koresframework.kores.bytecode.processor.METHOD_VISITOR +import com.koresframework.kores.processor.Processor +import com.koresframework.kores.processor.ProcessorManager import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.require diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationUtil.kt similarity index 93% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationUtil.kt index 08b3d18..510cc95 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationUtil.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.Annotation -import com.github.jonathanxd.kores.base.Retention -import com.github.jonathanxd.kores.base.EnumValue -import com.github.jonathanxd.kores.util.typeDesc +import com.koresframework.kores.base.Annotation +import com.koresframework.kores.base.Retention +import com.koresframework.kores.base.EnumValue +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.array.ArrayUtils import org.objectweb.asm.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationVisitorCapable.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationVisitorCapable.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationVisitorCapable.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationVisitorCapable.kt index 487133d..8ec0818 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/AnnotationVisitorCapable.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/AnnotationVisitorCapable.kt @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.bytecode.util.asm.ParameterVisitor +import com.koresframework.kores.bytecode.util.asm.ParameterVisitor import org.objectweb.asm.* /** diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ArrayUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ArrayUtil.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ArrayUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ArrayUtil.kt index 26737d1..9b2633d 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ArrayUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ArrayUtil.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.type.KoresType +import com.koresframework.kores.Types +import com.koresframework.kores.type.KoresType import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes import java.lang.reflect.Array as ReflectArray diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/BridgeUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/BridgeUtil.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/BridgeUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/BridgeUtil.kt index 07ca7dd..024872d 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/BridgeUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/BridgeUtil.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util import com.github.jonathanxd.iutils.kt.rightOrFail -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.common.MethodTypeSpec -import com.github.jonathanxd.kores.generic.GenericSignature -import com.github.jonathanxd.kores.type.* -import com.github.jonathanxd.kores.util.findType -import com.github.jonathanxd.kores.util.genericSignature -import com.github.jonathanxd.kores.util.inferType -import com.github.jonathanxd.kores.util.toTypeVars +import com.koresframework.kores.base.* +import com.koresframework.kores.common.MethodTypeSpec +import com.koresframework.kores.generic.GenericSignature +import com.koresframework.kores.type.* +import com.koresframework.kores.util.findType +import com.koresframework.kores.util.genericSignature +import com.koresframework.kores.util.inferType +import com.koresframework.kores.util.toTypeVars import java.lang.reflect.Type import java.lang.reflect.TypeVariable import java.util.* @@ -82,7 +82,7 @@ object BridgeUtil { return bridgeMethod .map { - com.github.jonathanxd.kores.factory.bridgeMethod( + com.koresframework.kores.factory.bridgeMethod( typeDeclaration, methodDeclaration, it diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ClassSaveUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ClassSaveUtil.kt similarity index 85% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ClassSaveUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ClassSaveUtil.kt index d91474c..44f3163 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ClassSaveUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ClassSaveUtil.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.bytecode.BytecodeClass +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.bytecode.BytecodeClass import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardOpenOption -fun com.github.jonathanxd.kores.bytecode.BytecodeClass.save( +fun BytecodeClass.save( directory: Path, disassemble: Boolean = false, alternativeDir: Boolean = false @@ -70,18 +70,18 @@ fun com.github.jonathanxd.kores.bytecode.BytecodeClass.save( } } -fun com.github.jonathanxd.kores.bytecode.BytecodeClass.toPath(base: Path): Path = +fun BytecodeClass.toPath(base: Path): Path = ((this.declaration as? TypeDeclaration)?.packageName ?: this.declaration.name) .split('.') .fold(base) { acc, s -> acc.resolve(s) } -fun com.github.jonathanxd.kores.bytecode.BytecodeClass.toPathWithName(base: Path): Path = +fun BytecodeClass.toPathWithName(base: Path): Path = this.toPath(base).resolve( (this.declaration as? TypeDeclaration)?.simpleName ?: this.declaration.name ) -fun com.github.jonathanxd.kores.bytecode.BytecodeClass.toPathWithNameAnd(base: Path, str: String): Path = +fun BytecodeClass.toPathWithNameAnd(base: Path, str: String): Path = this.toPath(base).resolve( "${(this.declaration as? TypeDeclaration)?.simpleName ?: this.declaration.name}$str" ) diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodePartUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/CodePartUtil.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodePartUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/CodePartUtil.kt index e7b6ca3..954b879 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodePartUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/CodePartUtil.kt @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.KoresPart -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.literal.Literals +import com.koresframework.kores.KoresPart +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.literal.Literals val KoresPart.booleanValue: Boolean get() = (this as Literal).name.toBoolean() diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodeTypeUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/CodeTypeUtil.kt similarity index 92% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodeTypeUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/CodeTypeUtil.kt index 92267c9..f21a955 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/CodeTypeUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/CodeTypeUtil.kt @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.ConstructorsHolder -import com.github.jonathanxd.kores.base.EnumDeclaration -import com.github.jonathanxd.kores.base.InnerTypesHolder -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.type.canonicalName -import com.github.jonathanxd.kores.type.isArray -import com.github.jonathanxd.kores.type.isPrimitive -import com.github.jonathanxd.kores.type.javaSpecName +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.Types +import com.koresframework.kores.base.ConstructorsHolder +import com.koresframework.kores.base.EnumDeclaration +import com.koresframework.kores.base.InnerTypesHolder +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.type.canonicalName +import com.koresframework.kores.type.isArray +import com.koresframework.kores.type.isPrimitive +import com.koresframework.kores.type.javaSpecName import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes import org.objectweb.asm.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ConstructorUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ConstructorUtil.kt similarity index 91% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ConstructorUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ConstructorUtil.kt index 7a038ca..23756ae 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ConstructorUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ConstructorUtil.kt @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.MutableInstructions -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper -import com.github.jonathanxd.kores.bytecode.processor.IN_EXPRESSION -import com.github.jonathanxd.kores.bytecode.processor.incrementInContext -import com.github.jonathanxd.kores.common.KoresNothing -import com.github.jonathanxd.kores.factory.setFieldValue -import com.github.jonathanxd.kores.processor.ProcessorManager -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type.internalName -import com.github.jonathanxd.kores.util.typeDesc +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.Instruction +import com.koresframework.kores.Instructions +import com.koresframework.kores.MutableInstructions +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.processor.IN_EXPRESSION +import com.koresframework.kores.bytecode.processor.incrementInContext +import com.koresframework.kores.common.KoresNothing +import com.koresframework.kores.factory.setFieldValue +import com.koresframework.kores.processor.ProcessorManager +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type.internalName +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import org.objectweb.asm.Label import org.objectweb.asm.MethodVisitor diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/Consts.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/Consts.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/Consts.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/Consts.kt index 80622a2..8361166 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/Consts.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/Consts.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/EnumUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/EnumUtil.kt similarity index 95% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/EnumUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/EnumUtil.kt index bd6d57b..4b2a610 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/EnumUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/EnumUtil.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.Instruction -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.builder.build -import com.github.jonathanxd.kores.common.getNewInnerName -import com.github.jonathanxd.kores.common.getNewName -import com.github.jonathanxd.kores.factory.* -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.type.Generic -import com.github.jonathanxd.kores.util.conversion.access +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.Instruction +import com.koresframework.kores.Instructions +import com.koresframework.kores.Types +import com.koresframework.kores.base.* +import com.koresframework.kores.builder.build +import com.koresframework.kores.common.getNewInnerName +import com.koresframework.kores.common.getNewName +import com.koresframework.kores.factory.* +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.type.Generic +import com.koresframework.kores.util.conversion.access import java.util.* import java.util.function.Predicate diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/IfUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/IfUtil.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/IfUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/IfUtil.kt index 046877a..90af62c 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/IfUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/IfUtil.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InsnUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/InsnUtil.kt similarity index 98% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InsnUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/InsnUtil.kt index 7663685..24f7127 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InsnUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/InsnUtil.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InvokeTypeUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/InvokeTypeUtil.kt similarity index 95% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InvokeTypeUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/InvokeTypeUtil.kt index 7213678..7f2e50d 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/InvokeTypeUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/InvokeTypeUtil.kt @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.DynamicInvokeType -import com.github.jonathanxd.kores.base.FieldAccessKind -import com.github.jonathanxd.kores.base.InvokeType -import com.github.jonathanxd.kores.base.InvokeType.* +import com.koresframework.kores.base.DynamicInvokeType +import com.koresframework.kores.base.FieldAccessKind +import com.koresframework.kores.base.InvokeType +import com.koresframework.kores.base.InvokeType.* import org.objectweb.asm.Opcodes.* object InvokeTypeUtil { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/LiteralUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/LiteralUtil.kt similarity index 90% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/LiteralUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/LiteralUtil.kt index 98e0b41..126c9b4 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/LiteralUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/LiteralUtil.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.common.Stack -import com.github.jonathanxd.kores.literal.Literal -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.type.KoresType -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.util.typeDesc +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.Types +import com.koresframework.kores.common.Stack +import com.koresframework.kores.literal.Literal +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.type.KoresType +import com.koresframework.kores.type.`is` +import com.koresframework.kores.util.typeDesc import org.objectweb.asm.MethodVisitor import org.objectweb.asm.Opcodes import org.objectweb.asm.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodInvocationUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/MethodInvocationUtil.kt similarity index 94% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodInvocationUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/MethodInvocationUtil.kt index a9e21fe..8f5dfd7 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodInvocationUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/MethodInvocationUtil.kt @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.bytecode.processor.processors.Util -import com.github.jonathanxd.kores.type.KoresType -import com.github.jonathanxd.kores.type.internalName -import com.github.jonathanxd.kores.type.javaSpecName -import com.github.jonathanxd.kores.util.TypeResolver -import com.github.jonathanxd.kores.util.resolveUnknown -import com.github.jonathanxd.kores.util.toTypeSpec -import com.github.jonathanxd.kores.util.typeDesc +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.base.* +import com.koresframework.kores.bytecode.processor.processors.Util +import com.koresframework.kores.type.KoresType +import com.koresframework.kores.type.internalName +import com.koresframework.kores.type.javaSpecName +import com.koresframework.kores.util.TypeResolver +import com.koresframework.kores.util.resolveUnknown +import com.koresframework.kores.util.toTypeSpec +import com.koresframework.kores.util.typeDesc import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.description.DescriptionUtil -import com.github.jonathanxd.kores.common.* -import com.github.jonathanxd.kores.type.isInterface +import com.koresframework.kores.common.* +import com.koresframework.kores.type.isInterface import org.objectweb.asm.* import java.util.* diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodsUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/MethodsUtil.kt similarity index 86% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodsUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/MethodsUtil.kt index e2787c7..6c75818 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/MethodsUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/MethodsUtil.kt @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.MethodDeclarationBase -import com.github.jonathanxd.kores.base.TypeDeclaration -import com.github.jonathanxd.kores.base.TypeSpec -import com.github.jonathanxd.kores.common.MethodTypeSpec -import com.github.jonathanxd.kores.type.`is` -import com.github.jonathanxd.kores.type.concreteType +import com.koresframework.kores.base.MethodDeclarationBase +import com.koresframework.kores.base.TypeDeclaration +import com.koresframework.kores.base.TypeSpec +import com.koresframework.kores.common.MethodTypeSpec +import com.koresframework.kores.type.`is` +import com.koresframework.kores.type.concreteType import java.lang.reflect.Method import java.lang.reflect.Type diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ModifierUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ModifierUtil.kt similarity index 96% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ModifierUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ModifierUtil.kt index 9953a90..f7ea58f 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ModifierUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ModifierUtil.kt @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.KoresModifier -import com.github.jonathanxd.kores.base.ModifierType -import com.github.jonathanxd.kores.base.TypeDeclaration +import com.koresframework.kores.base.KoresModifier +import com.koresframework.kores.base.ModifierType +import com.koresframework.kores.base.TypeDeclaration import org.objectweb.asm.Opcodes object ModifierUtil { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ObjectCache.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ObjectCache.kt similarity index 97% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ObjectCache.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ObjectCache.kt index 9256d2b..66b0db6 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ObjectCache.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ObjectCache.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util class ObjectCache { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/OperatorUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/OperatorUtil.kt similarity index 93% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/OperatorUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/OperatorUtil.kt index 4a0b000..b46eabb 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/OperatorUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/OperatorUtil.kt @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.operator.Operator -import com.github.jonathanxd.kores.operator.Operators.EQUAL_TO -import com.github.jonathanxd.kores.operator.Operators.GREATER_THAN -import com.github.jonathanxd.kores.operator.Operators.GREATER_THAN_OR_EQUAL_TO -import com.github.jonathanxd.kores.operator.Operators.LESS_THAN -import com.github.jonathanxd.kores.operator.Operators.LESS_THAN_OR_EQUAL_TO -import com.github.jonathanxd.kores.operator.Operators.NOT_EQUAL_TO +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.operator.Operator +import com.koresframework.kores.operator.Operators.EQUAL_TO +import com.koresframework.kores.operator.Operators.GREATER_THAN +import com.koresframework.kores.operator.Operators.GREATER_THAN_OR_EQUAL_TO +import com.koresframework.kores.operator.Operators.LESS_THAN +import com.koresframework.kores.operator.Operators.LESS_THAN_OR_EQUAL_TO +import com.koresframework.kores.operator.Operators.NOT_EQUAL_TO import org.objectweb.asm.Opcodes /** diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ParameterUtil.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/ParameterUtil.kt similarity index 93% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ParameterUtil.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/ParameterUtil.kt index 55e0ed5..a59c198 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/ParameterUtil.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/ParameterUtil.kt @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util +package com.koresframework.kores.bytecode.util -import com.github.jonathanxd.kores.base.KoresParameter -import com.github.jonathanxd.kores.bytecode.common.Variable +import com.koresframework.kores.base.KoresParameter +import com.koresframework.kores.bytecode.common.Variable import org.objectweb.asm.Label object ParameterUtil { diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/SwitchOnEnum.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/SwitchOnEnum.kt similarity index 92% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/SwitchOnEnum.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/SwitchOnEnum.kt index 59137ad..618681e 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/SwitchOnEnum.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/SwitchOnEnum.kt @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util - -import com.github.jonathanxd.kores.Instructions -import com.github.jonathanxd.kores.Types -import com.github.jonathanxd.kores.base.* -import com.github.jonathanxd.kores.base.comment.Comments -import com.github.jonathanxd.kores.bytecode.processor.TYPE_DECLARATION -import com.github.jonathanxd.kores.factory.* -import com.github.jonathanxd.kores.literal.Literals -import com.github.jonathanxd.kores.safeForComparison -import com.github.jonathanxd.kores.type -import com.github.jonathanxd.kores.type.KoresType -import com.github.jonathanxd.kores.type.koresType +package com.koresframework.kores.bytecode.util + +import com.koresframework.kores.Instructions +import com.koresframework.kores.Types +import com.koresframework.kores.base.* +import com.koresframework.kores.base.comment.Comments +import com.koresframework.kores.bytecode.processor.TYPE_DECLARATION +import com.koresframework.kores.factory.* +import com.koresframework.kores.literal.Literals +import com.koresframework.kores.safeForComparison +import com.koresframework.kores.type +import com.koresframework.kores.type.KoresType +import com.koresframework.kores.type.koresType import com.github.jonathanxd.iutils.data.TypedData import com.github.jonathanxd.iutils.kt.add import com.github.jonathanxd.iutils.kt.typedKeyOf diff --git a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/asm/ParameterVisitor.kt b/src/main/kotlin/com/koresframework/kores/bytecode/util/asm/ParameterVisitor.kt similarity index 93% rename from src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/asm/ParameterVisitor.kt rename to src/main/kotlin/com/koresframework/kores/bytecode/util/asm/ParameterVisitor.kt index 96c01c8..f6a4cbb 100644 --- a/src/main/kotlin/com/github/jonathanxd/kores/bytecode/util/asm/ParameterVisitor.kt +++ b/src/main/kotlin/com/koresframework/kores/bytecode/util/asm/ParameterVisitor.kt @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.bytecode.util.asm +package com.koresframework.kores.bytecode.util.asm -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper +import com.koresframework.kores.bytecode.common.MethodVisitorHelper import org.objectweb.asm.AnnotationVisitor class ParameterVisitor(val mvData: MethodVisitorHelper, val pos: Int) { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/AnnotatedTest.java b/src/test/java/com/koresframework/kores/test/asm/AnnotatedTest.java similarity index 91% rename from src/test/java/com/github/jonathanxd/kores/test/asm/AnnotatedTest.java rename to src/test/java/com/koresframework/kores/test/asm/AnnotatedTest.java index 8f73e03..3240385 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/AnnotatedTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/AnnotatedTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.AnnotatedTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.AnnotatedTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/AnnotationTest.java b/src/test/java/com/koresframework/kores/test/asm/AnnotationTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/AnnotationTest.java rename to src/test/java/com/koresframework/kores/test/asm/AnnotationTest.java index cbca273..76a8460 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/AnnotationTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/AnnotationTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.AnnotationTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.AnnotationTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ArrayParameterTest.java b/src/test/java/com/koresframework/kores/test/asm/ArrayParameterTest.java similarity index 84% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ArrayParameterTest.java rename to src/test/java/com/koresframework/kores/test/asm/ArrayParameterTest.java index 79a908a..ec67973 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ArrayParameterTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ArrayParameterTest.java @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.test.PredefinedTest; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.test.PredefinedTest; import org.junit.Test; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.cast; -import static com.github.jonathanxd.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.cast; +import static com.koresframework.kores.factory.Factories.parameter; public class ArrayParameterTest { final String name = getClass().getCanonicalName() + "_Generated"; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ArrayTest.java b/src/test/java/com/koresframework/kores/test/asm/ArrayTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ArrayTest.java rename to src/test/java/com/koresframework/kores/test/asm/ArrayTest.java index 2b2cfb4..5c43f81 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ArrayTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ArrayTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.CommonGen; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.CommonGen; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/BCLoader.java b/src/test/java/com/koresframework/kores/test/asm/BCLoader.java similarity index 94% rename from src/test/java/com/github/jonathanxd/kores/test/asm/BCLoader.java rename to src/test/java/com/koresframework/kores/test/asm/BCLoader.java index 97031d9..091c642 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/BCLoader.java +++ b/src/test/java/com/koresframework/kores/test/asm/BCLoader.java @@ -25,9 +25,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; +import com.koresframework.kores.base.TypeDeclaration; public final class BCLoader extends ClassLoader { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/BitwiseIfTest.java b/src/test/java/com/koresframework/kores/test/asm/BitwiseIfTest.java similarity index 94% rename from src/test/java/com/github/jonathanxd/kores/test/asm/BitwiseIfTest.java rename to src/test/java/com/koresframework/kores/test/asm/BitwiseIfTest.java index 78c08aa..397052b 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/BitwiseIfTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/BitwiseIfTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.BitwiseIfTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.BitwiseIfTest_; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.link.Invokables; import com.github.jonathanxd.iutils.link.Link; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest.java b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest.java similarity index 82% rename from src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest.java rename to src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest.java index 0b528fa..c733e89 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest.java @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ForEachStatement; -import com.github.jonathanxd.kores.base.InterfaceDeclaration; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.generic.GenericSignature; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.type.Generic; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ForEachStatement; +import com.koresframework.kores.base.InterfaceDeclaration; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.generic.GenericSignature; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.type.Generic; import org.junit.Test; @@ -53,10 +53,10 @@ import kotlin.collections.CollectionsKt; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.forEachIterable; -import static com.github.jonathanxd.kores.factory.Factories.parameter; -import static com.github.jonathanxd.kores.factory.Factories.typeSpec; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.forEachIterable; +import static com.koresframework.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.Factories.typeSpec; public class BridgeMethodsTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest2.java b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest2.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest2.java rename to src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest2.java index 2b4e9c3..8898f51 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest2.java +++ b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest2.java @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.literal.Literals; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.literal.Literals; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest3.java b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest3.java similarity index 86% rename from src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest3.java rename to src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest3.java index cb06647..b70eb18 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/BridgeMethodsTest3.java +++ b/src/test/java/com/koresframework/kores/test/asm/BridgeMethodsTest3.java @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.helper.Predefined; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.helper.Predefined; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/CallMethodFragment.java b/src/test/java/com/koresframework/kores/test/asm/CallMethodFragment.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/CallMethodFragment.java rename to src/test/java/com/koresframework/kores/test/asm/CallMethodFragment.java index ff72bd0..3f3a06b 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/CallMethodFragment.java +++ b/src/test/java/com/koresframework/kores/test/asm/CallMethodFragment.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.LocalCode_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.LocalCode_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/CastBugTest.java b/src/test/java/com/koresframework/kores/test/asm/CastBugTest.java similarity index 81% rename from src/test/java/com/github/jonathanxd/kores/test/asm/CastBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/CastBugTest.java index c284fa2..04c61e8 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/CastBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/CastBugTest.java @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.helper.Predefined; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.helper.Predefined; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ClSaverTest.java b/src/test/java/com/koresframework/kores/test/asm/ClSaverTest.java similarity index 79% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ClSaverTest.java rename to src/test/java/com/koresframework/kores/test/asm/ClSaverTest.java index d86d370..14f74e4 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ClSaverTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ClSaverTest.java @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.bytecode.util.ClassSaveUtilKt; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.bytecode.util.ClassSaveUtilKt; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/CommonBytecodeTest.java b/src/test/java/com/koresframework/kores/test/asm/CommonBytecodeTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/CommonBytecodeTest.java rename to src/test/java/com/koresframework/kores/test/asm/CommonBytecodeTest.java index 88cb6f3..8bbe237 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/CommonBytecodeTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/CommonBytecodeTest.java @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.VisitLineType; -import com.github.jonathanxd.kores.bytecode.exception.ClassCheckException; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.VisitLineType; +import com.koresframework.kores.bytecode.exception.ClassCheckException; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.exception.RethrowException; import com.github.jonathanxd.iutils.function.checked.function.CFunction; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ComplexIfTest.java b/src/test/java/com/koresframework/kores/test/asm/ComplexIfTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ComplexIfTest.java rename to src/test/java/com/koresframework/kores/test/asm/ComplexIfTest.java index 1f30384..cca2d3d 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ComplexIfTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ComplexIfTest.java @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.test.ComplexIfTest2_; -import com.github.jonathanxd.kores.test.ComplexIfTest3_; -import com.github.jonathanxd.kores.test.ComplexIfTest4_; -import com.github.jonathanxd.kores.test.ComplexIfTest_; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.test.ComplexIfTest2_; +import com.koresframework.kores.test.ComplexIfTest3_; +import com.koresframework.kores.test.ComplexIfTest4_; +import com.koresframework.kores.test.ComplexIfTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ConcatTest.java b/src/test/java/com/koresframework/kores/test/asm/ConcatTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ConcatTest.java rename to src/test/java/com/koresframework/kores/test/asm/ConcatTest.java index bd411c2..4b4c7e8 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ConcatTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ConcatTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.ConcatTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.ConcatTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/DoubleTest.java b/src/test/java/com/koresframework/kores/test/asm/DoubleTest.java similarity index 78% rename from src/test/java/com/github/jonathanxd/kores/test/asm/DoubleTest.java rename to src/test/java/com/koresframework/kores/test/asm/DoubleTest.java index 20735e1..771f49d 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/DoubleTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/DoubleTest.java @@ -25,29 +25,29 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.helper.Predefined; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.helper.Predefined; import org.junit.Test; import java.util.Collection; import java.util.List; -import static com.github.jonathanxd.kores.Types.VOID; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.parameter; -import static com.github.jonathanxd.kores.factory.VariableFactory.variable; -import static com.github.jonathanxd.kores.literal.Literals.STRING; +import static com.koresframework.kores.Types.VOID; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.VariableFactory.variable; +import static com.koresframework.kores.literal.Literals.STRING; public class DoubleTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/DupTest.java b/src/test/java/com/koresframework/kores/test/asm/DupTest.java similarity index 79% rename from src/test/java/com/github/jonathanxd/kores/test/asm/DupTest.java rename to src/test/java/com/koresframework/kores/test/asm/DupTest.java index 1fac815..f2039ef 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/DupTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/DupTest.java @@ -25,23 +25,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.IfStatement; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.base.TypeSpec; -import com.github.jonathanxd.kores.bytecode.extra.Dup; -import com.github.jonathanxd.kores.bytecode.extra.Pop; -import com.github.jonathanxd.kores.common.Stack; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.IfStatement; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.base.TypeSpec; +import com.koresframework.kores.bytecode.extra.Dup; +import com.koresframework.kores.bytecode.extra.Pop; +import com.koresframework.kores.common.Stack; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/EnumTest.java b/src/test/java/com/koresframework/kores/test/asm/EnumTest.java similarity index 93% rename from src/test/java/com/github/jonathanxd/kores/test/asm/EnumTest.java rename to src/test/java/com/koresframework/kores/test/asm/EnumTest.java index 55e2e96..0b0acde 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/EnumTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/EnumTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.EnumTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.EnumTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Assert; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/FakeElvisTest.java b/src/test/java/com/koresframework/kores/test/asm/FakeElvisTest.java similarity index 93% rename from src/test/java/com/github/jonathanxd/kores/test/asm/FakeElvisTest.java rename to src/test/java/com/koresframework/kores/test/asm/FakeElvisTest.java index 791b63d..0ca4b1b 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/FakeElvisTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/FakeElvisTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.FakeElvisTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.FakeElvisTest_; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.exception.RethrowException; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/FinalFieldWithThis.java b/src/test/java/com/koresframework/kores/test/asm/FinalFieldWithThis.java similarity index 74% rename from src/test/java/com/github/jonathanxd/kores/test/asm/FinalFieldWithThis.java rename to src/test/java/com/koresframework/kores/test/asm/FinalFieldWithThis.java index bc1b2d6..cb43923 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/FinalFieldWithThis.java +++ b/src/test/java/com/koresframework/kores/test/asm/FinalFieldWithThis.java @@ -25,28 +25,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.exception.RethrowException; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.literal.Literals; import org.junit.Test; import java.util.function.UnaryOperator; -import static com.github.jonathanxd.kores.base.KoresModifier.FINAL; -import static com.github.jonathanxd.kores.base.KoresModifier.PRIVATE; -import static com.github.jonathanxd.kores.base.KoresModifier.PUBLIC; -import static com.github.jonathanxd.kores.factory.Factories.constructorTypeSpec; -import static com.github.jonathanxd.kores.factory.InvocationFactory.invokeConstructor; -import static com.github.jonathanxd.kores.factory.InvocationFactory.invokeSuperConstructor; -import static com.github.jonathanxd.kores.factory.PartFactory.classDec; -import static com.github.jonathanxd.kores.factory.PartFactory.constructorDec; -import static com.github.jonathanxd.kores.factory.PartFactory.fieldDec; -import static com.github.jonathanxd.kores.factory.PartFactory.source; +import static com.koresframework.kores.base.KoresModifier.FINAL; +import static com.koresframework.kores.base.KoresModifier.PRIVATE; +import static com.koresframework.kores.base.KoresModifier.PUBLIC; +import static com.koresframework.kores.factory.Factories.constructorTypeSpec; +import static com.koresframework.kores.factory.InvocationFactory.invokeConstructor; +import static com.koresframework.kores.factory.InvocationFactory.invokeSuperConstructor; +import static com.koresframework.kores.factory.PartFactory.classDec; +import static com.koresframework.kores.factory.PartFactory.constructorDec; +import static com.koresframework.kores.factory.PartFactory.fieldDec; +import static com.koresframework.kores.factory.PartFactory.source; import static kotlin.collections.CollectionsKt.listOf; public class FinalFieldWithThis { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/FinallyTest.java b/src/test/java/com/koresframework/kores/test/asm/FinallyTest.java similarity index 77% rename from src/test/java/com/github/jonathanxd/kores/test/asm/FinallyTest.java rename to src/test/java/com/koresframework/kores/test/asm/FinallyTest.java index 92e3d62..9808d51 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/FinallyTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/FinallyTest.java @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; @@ -39,16 +39,16 @@ import java.util.Arrays; import java.util.Collections; -import static com.github.jonathanxd.kores.base.KoresModifier.PUBLIC; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.catchStatement; -import static com.github.jonathanxd.kores.factory.Factories.constructorTypeSpec; -import static com.github.jonathanxd.kores.factory.Factories.throwException; -import static com.github.jonathanxd.kores.factory.Factories.tryStatement; -import static com.github.jonathanxd.kores.factory.InvocationFactory.invokeConstructor; -import static com.github.jonathanxd.kores.factory.PartFactory.classDec; -import static com.github.jonathanxd.kores.factory.PartFactory.constructorDec; -import static com.github.jonathanxd.kores.factory.PartFactory.source; +import static com.koresframework.kores.base.KoresModifier.PUBLIC; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.catchStatement; +import static com.koresframework.kores.factory.Factories.constructorTypeSpec; +import static com.koresframework.kores.factory.Factories.throwException; +import static com.koresframework.kores.factory.Factories.tryStatement; +import static com.koresframework.kores.factory.InvocationFactory.invokeConstructor; +import static com.koresframework.kores.factory.PartFactory.classDec; +import static com.koresframework.kores.factory.PartFactory.constructorDec; +import static com.koresframework.kores.factory.PartFactory.source; public class FinallyTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/FireEnumTest.java b/src/test/java/com/koresframework/kores/test/asm/FireEnumTest.java similarity index 94% rename from src/test/java/com/github/jonathanxd/kores/test/asm/FireEnumTest.java rename to src/test/java/com/koresframework/kores/test/asm/FireEnumTest.java index 635a9e4..cfa18a9 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/FireEnumTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/FireEnumTest.java @@ -25,28 +25,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.collection.Collections3; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.Alias; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.FieldDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.common.Commons; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.generic.GenericSignature; -import com.github.jonathanxd.kores.helper.ConcatHelper; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.type.Generic; -import com.github.jonathanxd.kores.type.TypeRef; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.Alias; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.FieldDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.common.Commons; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.generic.GenericSignature; +import com.koresframework.kores.helper.ConcatHelper; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.type.Generic; +import com.koresframework.kores.type.TypeRef; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ForEachArrayClassTest.java b/src/test/java/com/koresframework/kores/test/asm/ForEachArrayClassTest.java similarity index 93% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ForEachArrayClassTest.java rename to src/test/java/com/koresframework/kores/test/asm/ForEachArrayClassTest.java index 62ca7fe..1144e6d 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ForEachArrayClassTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ForEachArrayClassTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.ForEachArray_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.ForEachArray_; import com.github.jonathanxd.iutils.exception.RethrowException; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ForEachClassTest.java b/src/test/java/com/koresframework/kores/test/asm/ForEachClassTest.java similarity index 93% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ForEachClassTest.java rename to src/test/java/com/koresframework/kores/test/asm/ForEachClassTest.java index 7c22c0b..9ee7b4f 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ForEachClassTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/ForEachClassTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.ForEach_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.ForEach_; import com.github.jonathanxd.iutils.exception.RethrowException; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/GenericClassTest.java b/src/test/java/com/koresframework/kores/test/asm/GenericClassTest.java similarity index 91% rename from src/test/java/com/github/jonathanxd/kores/test/asm/GenericClassTest.java rename to src/test/java/com/koresframework/kores/test/asm/GenericClassTest.java index d3362fb..37faa9c 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/GenericClassTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/GenericClassTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.GenericClass_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.GenericClass_; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/GenericInterfaceTest.java b/src/test/java/com/koresframework/kores/test/asm/GenericInterfaceTest.java similarity index 86% rename from src/test/java/com/github/jonathanxd/kores/test/asm/GenericInterfaceTest.java rename to src/test/java/com/koresframework/kores/test/asm/GenericInterfaceTest.java index 7982ef9..2313de5 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/GenericInterfaceTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/GenericInterfaceTest.java @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.InterfaceDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.type.Generic; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.InterfaceDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.type.Generic; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/IndifyConcatTest.java b/src/test/java/com/koresframework/kores/test/asm/IndifyConcatTest.java similarity index 89% rename from src/test/java/com/github/jonathanxd/kores/test/asm/IndifyConcatTest.java rename to src/test/java/com/koresframework/kores/test/asm/IndifyConcatTest.java index b63f8af..c9d6dec 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/IndifyConcatTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/IndifyConcatTest.java @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.IndyConcatStrategy; -import com.github.jonathanxd.kores.test.ConcatTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.IndyConcatStrategy; +import com.koresframework.kores.test.ConcatTest_; import org.junit.Test; import java.util.function.UnaryOperator; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/IndyTest.java b/src/test/java/com/koresframework/kores/test/asm/IndyTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/IndyTest.java rename to src/test/java/com/koresframework/kores/test/asm/IndyTest.java index b29f28a..8ca5a69 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/IndyTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/IndyTest.java @@ -25,37 +25,32 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; -import com.github.jonathanxd.kores.*; -import com.github.jonathanxd.kores.base.*; -import com.github.jonathanxd.kores.common.*; -import com.github.jonathanxd.kores.factory.DynamicInvocationFactory; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; -import com.github.jonathanxd.kores.test.*; -import com.github.jonathanxd.kores.type.KoresType; -import com.github.jonathanxd.kores.type.KoresTypes; -import com.github.jonathanxd.kores.type.TypeRef; +import com.koresframework.kores.*; +import com.koresframework.kores.base.*; +import com.koresframework.kores.common.*; +import com.koresframework.kores.factory.DynamicInvocationFactory; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; +import com.koresframework.kores.type.KoresType; +import com.koresframework.kores.type.KoresTypes; +import com.koresframework.kores.type.TypeRef; import org.junit.Assert; import org.junit.Test; import java.io.PrintStream; import java.lang.invoke.*; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Arrays; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; import java.util.function.UnaryOperator; -import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; public class IndyTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InnerClassTest.java b/src/test/java/com/koresframework/kores/test/asm/InnerClassTest.java similarity index 88% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InnerClassTest.java rename to src/test/java/com/koresframework/kores/test/asm/InnerClassTest.java index a3ea41e..1c72ee1 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InnerClassTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/InnerClassTest.java @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.ComplexInnerClassTest_; -import com.github.jonathanxd.kores.test.ComplexStatic1InnerClassTest_; -import com.github.jonathanxd.kores.test.ComplexStatic2InnerClassTest_; -import com.github.jonathanxd.kores.test.InnerClassTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.ComplexInnerClassTest_; +import com.koresframework.kores.test.ComplexStatic1InnerClassTest_; +import com.koresframework.kores.test.ComplexStatic2InnerClassTest_; +import com.koresframework.kores.test.InnerClassTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InstanceOfTest.java b/src/test/java/com/koresframework/kores/test/asm/InstanceOfTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InstanceOfTest.java rename to src/test/java/com/koresframework/kores/test/asm/InstanceOfTest.java index 1e578fa..6ef5ba2 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InstanceOfTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/InstanceOfTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.InstanceOf_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.InstanceOf_; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.exception.RethrowException; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InterfaceTest.java b/src/test/java/com/koresframework/kores/test/asm/InterfaceTest.java similarity index 80% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InterfaceTest.java rename to src/test/java/com/koresframework/kores/test/asm/InterfaceTest.java index b687a0d..5019224 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InterfaceTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/InterfaceTest.java @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.InterfaceDeclaration; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.InterfaceDeclaration; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; import org.junit.Test; -import static com.github.jonathanxd.kores.Types.INT; -import static com.github.jonathanxd.kores.Types.STRING; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.operate; -import static com.github.jonathanxd.kores.factory.Factories.parameter; -import static com.github.jonathanxd.kores.factory.Factories.returnValue; +import static com.koresframework.kores.Types.INT; +import static com.koresframework.kores.Types.STRING; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.operate; +import static com.koresframework.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.Factories.returnValue; public class InterfaceTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InvCall.java b/src/test/java/com/koresframework/kores/test/asm/InvCall.java similarity index 83% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InvCall.java rename to src/test/java/com/koresframework/kores/test/asm/InvCall.java index 5c89ca1..3ce29ae 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InvCall.java +++ b/src/test/java/com/koresframework/kores/test/asm/InvCall.java @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.literal.Literals; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.literal.Literals; import com.github.jonathanxd.iutils.exception.RethrowException; import org.junit.Test; import kotlin.collections.CollectionsKt; -import static com.github.jonathanxd.kores.Types.STRING; +import static com.koresframework.kores.Types.STRING; public class InvCall { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperConstructorBugTest.java b/src/test/java/com/koresframework/kores/test/asm/InvokeSuperConstructorBugTest.java similarity index 85% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperConstructorBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/InvokeSuperConstructorBugTest.java index 2dddd7b..ef5ca07 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperConstructorBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/InvokeSuperConstructorBugTest.java @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.Alias; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.Alias; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperTest.java b/src/test/java/com/koresframework/kores/test/asm/InvokeSuperTest.java similarity index 82% rename from src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperTest.java rename to src/test/java/com/koresframework/kores/test/asm/InvokeSuperTest.java index 2c54246..dc4da7f 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/InvokeSuperTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/InvokeSuperTest.java @@ -25,25 +25,25 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.literal.Literals; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.literal.Literals; import com.github.jonathanxd.iutils.exception.RethrowException; import org.junit.Test; import kotlin.collections.CollectionsKt; -import static com.github.jonathanxd.kores.Types.STRING; +import static com.koresframework.kores.Types.STRING; public class InvokeSuperTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/KoresTestBytecode.java b/src/test/java/com/koresframework/kores/test/asm/KoresTestBytecode.java similarity index 86% rename from src/test/java/com/github/jonathanxd/kores/test/asm/KoresTestBytecode.java rename to src/test/java/com/koresframework/kores/test/asm/KoresTestBytecode.java index 599653b..9141deb 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/KoresTestBytecode.java +++ b/src/test/java/com/koresframework/kores/test/asm/KoresTestBytecode.java @@ -25,31 +25,31 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instruction; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.MutableInstructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.CatchStatement; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.IfStatement; -import com.github.jonathanxd.kores.base.InvokeType; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeSpec; -import com.github.jonathanxd.kores.base.VariableDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; -import com.github.jonathanxd.kores.type.KoresType; -import com.github.jonathanxd.kores.type.KoresTypes; -import com.github.jonathanxd.kores.type.LoadedKoresType; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instruction; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.MutableInstructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.CatchStatement; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.IfStatement; +import com.koresframework.kores.base.InvokeType; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeSpec; +import com.koresframework.kores.base.VariableDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; +import com.koresframework.kores.type.KoresType; +import com.koresframework.kores.type.KoresTypes; +import com.koresframework.kores.type.LoadedKoresType; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/KoresTest_API.java b/src/test/java/com/koresframework/kores/test/asm/KoresTest_API.java similarity index 81% rename from src/test/java/com/github/jonathanxd/kores/test/asm/KoresTest_API.java rename to src/test/java/com/koresframework/kores/test/asm/KoresTest_API.java index 82a6177..a536bc5 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/KoresTest_API.java +++ b/src/test/java/com/koresframework/kores/test/asm/KoresTest_API.java @@ -25,26 +25,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.helper.Predefined; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.helper.Predefined; import org.junit.Test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import static com.github.jonathanxd.kores.Types.STRING; -import static com.github.jonathanxd.kores.Types.VOID; -import static com.github.jonathanxd.kores.base.KoresModifier.PUBLIC; -import static com.github.jonathanxd.kores.base.KoresModifier.STATIC; +import static com.koresframework.kores.Types.STRING; +import static com.koresframework.kores.Types.VOID; +import static com.koresframework.kores.base.KoresModifier.PUBLIC; +import static com.koresframework.kores.base.KoresModifier.STATIC; @SuppressWarnings("Duplicates") public class KoresTest_API { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/LineTest.java b/src/test/java/com/koresframework/kores/test/asm/LineTest.java similarity index 89% rename from src/test/java/com/github/jonathanxd/kores/test/asm/LineTest.java rename to src/test/java/com/koresframework/kores/test/asm/LineTest.java index 1c492b4..ee33f13 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/LineTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/LineTest.java @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.VisitLineType; -import com.github.jonathanxd.kores.test.LineTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.VisitLineType; +import com.koresframework.kores.test.LineTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/LiteralBugTest.java b/src/test/java/com/koresframework/kores/test/asm/LiteralBugTest.java similarity index 80% rename from src/test/java/com/github/jonathanxd/kores/test/asm/LiteralBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/LiteralBugTest.java index fdd9c70..c164a3d 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/LiteralBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/LiteralBugTest.java @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalClassTest.java b/src/test/java/com/koresframework/kores/test/asm/LocalClassTest.java similarity index 92% rename from src/test/java/com/github/jonathanxd/kores/test/asm/LocalClassTest.java rename to src/test/java/com/koresframework/kores/test/asm/LocalClassTest.java index 43e6131..f934646 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalClassTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/LocalClassTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.LocalClassTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.LocalClassTest_; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalLambdaBugTest.java b/src/test/java/com/koresframework/kores/test/asm/LocalLambdaBugTest.java similarity index 83% rename from src/test/java/com/github/jonathanxd/kores/test/asm/LocalLambdaBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/LocalLambdaBugTest.java index 9865a34..82dd02f 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalLambdaBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/LocalLambdaBugTest.java @@ -25,31 +25,31 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.Alias; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.InvokeType; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.base.TypeSpec; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.exception.ClassCheckException; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.common.MethodInvokeSpec; -import com.github.jonathanxd.kores.common.MethodTypeSpec; -import com.github.jonathanxd.kores.factory.DynamicInvocationFactory; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.helper.ConcatHelper; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.type.Generic; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.Alias; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.InvokeType; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.base.TypeSpec; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.exception.ClassCheckException; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.common.MethodInvokeSpec; +import com.koresframework.kores.common.MethodTypeSpec; +import com.koresframework.kores.factory.DynamicInvocationFactory; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.helper.ConcatHelper; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.type.Generic; import com.github.jonathanxd.iutils.collection.Collections3; import org.junit.Assert; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalsReuseTest.java b/src/test/java/com/koresframework/kores/test/asm/LocalsReuseTest.java similarity index 83% rename from src/test/java/com/github/jonathanxd/kores/test/asm/LocalsReuseTest.java rename to src/test/java/com/koresframework/kores/test/asm/LocalsReuseTest.java index 6ca5447..a02673a 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/LocalsReuseTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/LocalsReuseTest.java @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.VisitLineType; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.bytecode.util.ConstsKt; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.VisitLineType; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.bytecode.util.ConstsKt; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.literal.Literals; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/NewIfTest.java b/src/test/java/com/koresframework/kores/test/asm/NewIfTest.java similarity index 85% rename from src/test/java/com/github/jonathanxd/kores/test/asm/NewIfTest.java rename to src/test/java/com/koresframework/kores/test/asm/NewIfTest.java index 23d142c..ff67ed1 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/NewIfTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/NewIfTest.java @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Assert; @@ -38,11 +38,11 @@ import java.util.function.UnaryOperator; -import static com.github.jonathanxd.kores.Types.INT; -import static com.github.jonathanxd.kores.base.KoresModifier.PUBLIC; -import static com.github.jonathanxd.kores.factory.PartFactory.classDec; -import static com.github.jonathanxd.kores.factory.PartFactory.methodDec; -import static com.github.jonathanxd.kores.factory.PartFactory.source; +import static com.koresframework.kores.Types.INT; +import static com.koresframework.kores.base.KoresModifier.PUBLIC; +import static com.koresframework.kores.factory.PartFactory.classDec; +import static com.koresframework.kores.factory.PartFactory.methodDec; +import static com.koresframework.kores.factory.PartFactory.source; public class NewIfTest { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/OperateTest.java b/src/test/java/com/koresframework/kores/test/asm/OperateTest.java similarity index 93% rename from src/test/java/com/github/jonathanxd/kores/test/asm/OperateTest.java rename to src/test/java/com/koresframework/kores/test/asm/OperateTest.java index c5135ee..fd6d518 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/OperateTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/OperateTest.java @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.exception.RethrowException; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.OperateTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.OperateTest_; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/PrimitiveCast.java b/src/test/java/com/koresframework/kores/test/asm/PrimitiveCast.java similarity index 78% rename from src/test/java/com/github/jonathanxd/kores/test/asm/PrimitiveCast.java rename to src/test/java/com/koresframework/kores/test/asm/PrimitiveCast.java index 31fb6b6..716fb0a 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/PrimitiveCast.java +++ b/src/test/java/com/koresframework/kores/test/asm/PrimitiveCast.java @@ -25,17 +25,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; @@ -43,19 +43,19 @@ import java.lang.invoke.MethodHandles; import java.util.Collections; -import static com.github.jonathanxd.kores.Types.BYTE; -import static com.github.jonathanxd.kores.Types.INT; -import static com.github.jonathanxd.kores.Types.LONG; -import static com.github.jonathanxd.kores.Types.OBJECT; -import static com.github.jonathanxd.kores.Types.STRING; -import static com.github.jonathanxd.kores.base.KoresModifier.PUBLIC; -import static com.github.jonathanxd.kores.base.KoresModifier.STATIC; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.cast; -import static com.github.jonathanxd.kores.factory.Factories.constructorTypeSpec; -import static com.github.jonathanxd.kores.factory.Factories.parameter; -import static com.github.jonathanxd.kores.factory.Factories.returnValue; -import static com.github.jonathanxd.kores.factory.VariableFactory.variable; +import static com.koresframework.kores.Types.BYTE; +import static com.koresframework.kores.Types.INT; +import static com.koresframework.kores.Types.LONG; +import static com.koresframework.kores.Types.OBJECT; +import static com.koresframework.kores.Types.STRING; +import static com.koresframework.kores.base.KoresModifier.PUBLIC; +import static com.koresframework.kores.base.KoresModifier.STATIC; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.cast; +import static com.koresframework.kores.factory.Factories.constructorTypeSpec; +import static com.koresframework.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.Factories.returnValue; +import static com.koresframework.kores.factory.VariableFactory.variable; @SuppressWarnings("Duplicates") diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/RecursiveGenericTypeTest.java b/src/test/java/com/koresframework/kores/test/asm/RecursiveGenericTypeTest.java similarity index 84% rename from src/test/java/com/github/jonathanxd/kores/test/asm/RecursiveGenericTypeTest.java rename to src/test/java/com/koresframework/kores/test/asm/RecursiveGenericTypeTest.java index 9ac72e5..1bbce91 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/RecursiveGenericTypeTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/RecursiveGenericTypeTest.java @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.KoresParameter; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.PartFactory; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.type.Generic; -import com.github.jonathanxd.kores.type.GenericType; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.KoresParameter; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.PartFactory; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.type.Generic; +import com.koresframework.kores.type.GenericType; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/ResultSaver.java b/src/test/java/com/koresframework/kores/test/asm/ResultSaver.java similarity index 96% rename from src/test/java/com/github/jonathanxd/kores/test/asm/ResultSaver.java rename to src/test/java/com/koresframework/kores/test/asm/ResultSaver.java index 0fdfac6..ae451b8 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/ResultSaver.java +++ b/src/test/java/com/koresframework/kores/test/asm/ResultSaver.java @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.bytecodedisassembler.Disassembler; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; import com.github.jonathanxd.iutils.array.PrimitiveArrayConverter; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeClass; import java.io.File; import java.nio.charset.Charset; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/SelfPrivateAccessBugTest.java b/src/test/java/com/koresframework/kores/test/asm/SelfPrivateAccessBugTest.java similarity index 88% rename from src/test/java/com/github/jonathanxd/kores/test/asm/SelfPrivateAccessBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/SelfPrivateAccessBugTest.java index f428dd4..9c4ba99 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/SelfPrivateAccessBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/SelfPrivateAccessBugTest.java @@ -25,16 +25,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.PartFactory; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.PartFactory; +import com.koresframework.kores.literal.Literals; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/SimpleTest2_Bytecode.java b/src/test/java/com/koresframework/kores/test/asm/SimpleTest2_Bytecode.java similarity index 83% rename from src/test/java/com/github/jonathanxd/kores/test/asm/SimpleTest2_Bytecode.java rename to src/test/java/com/koresframework/kores/test/asm/SimpleTest2_Bytecode.java index c2cafc5..1cfa3fa 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/SimpleTest2_Bytecode.java +++ b/src/test/java/com/koresframework/kores/test/asm/SimpleTest2_Bytecode.java @@ -25,22 +25,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.Access; -import com.github.jonathanxd.kores.base.Alias; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.FieldDeclaration; -import com.github.jonathanxd.kores.base.InvokeType; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.Access; +import com.koresframework.kores.base.Alias; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.FieldDeclaration; +import com.koresframework.kores.base.InvokeType; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; import org.junit.Test; @@ -49,16 +49,16 @@ import java.lang.invoke.MethodHandles; import java.util.Collections; -import static com.github.jonathanxd.kores.factory.Factories.accessStaticField; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.cast; -import static com.github.jonathanxd.kores.factory.Factories.check; -import static com.github.jonathanxd.kores.factory.Factories.ifExprs; -import static com.github.jonathanxd.kores.factory.Factories.ifStatement; -import static com.github.jonathanxd.kores.factory.Factories.parameter; -import static com.github.jonathanxd.kores.factory.Factories.setFieldValue; -import static com.github.jonathanxd.kores.factory.Factories.typeSpec; -import static com.github.jonathanxd.kores.factory.InvocationFactory.invoke; +import static com.koresframework.kores.factory.Factories.accessStaticField; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.cast; +import static com.koresframework.kores.factory.Factories.check; +import static com.koresframework.kores.factory.Factories.ifExprs; +import static com.koresframework.kores.factory.Factories.ifStatement; +import static com.koresframework.kores.factory.Factories.parameter; +import static com.koresframework.kores.factory.Factories.setFieldValue; +import static com.koresframework.kores.factory.Factories.typeSpec; +import static com.koresframework.kores.factory.InvocationFactory.invoke; public class SimpleTest2_Bytecode { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/SwitchTest.java b/src/test/java/com/koresframework/kores/test/asm/SwitchTest.java similarity index 94% rename from src/test/java/com/github/jonathanxd/kores/test/asm/SwitchTest.java rename to src/test/java/com/koresframework/kores/test/asm/SwitchTest.java index 6227db9..00546b3 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/SwitchTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/SwitchTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.SwitchTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.SwitchTest_; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.exception.RethrowException; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/SynchronizedTest.java b/src/test/java/com/koresframework/kores/test/asm/SynchronizedTest.java similarity index 91% rename from src/test/java/com/github/jonathanxd/kores/test/asm/SynchronizedTest.java rename to src/test/java/com/koresframework/kores/test/asm/SynchronizedTest.java index 0a2937b..54be7df 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/SynchronizedTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/SynchronizedTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.SynchronizedTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.SynchronizedTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode.java b/src/test/java/com/koresframework/kores/test/asm/TestBytecode.java similarity index 95% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode.java rename to src/test/java/com/koresframework/kores/test/asm/TestBytecode.java index 41dbac9..add73cf 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode.java +++ b/src/test/java/com/koresframework/kores/test/asm/TestBytecode.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.TestFeatures_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.TestFeatures_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode_Invocations.java b/src/test/java/com/koresframework/kores/test/asm/TestBytecode_Invocations.java similarity index 95% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode_Invocations.java rename to src/test/java/com/koresframework/kores/test/asm/TestBytecode_Invocations.java index 99da06e..aaad0c2 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TestBytecode_Invocations.java +++ b/src/test/java/com/koresframework/kores/test/asm/TestBytecode_Invocations.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.InvocationsTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.InvocationsTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TestHelloBytecode.java b/src/test/java/com/koresframework/kores/test/asm/TestHelloBytecode.java similarity index 86% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TestHelloBytecode.java rename to src/test/java/com/koresframework/kores/test/asm/TestHelloBytecode.java index 7cc6ee9..48eac3c 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TestHelloBytecode.java +++ b/src/test/java/com/koresframework/kores/test/asm/TestHelloBytecode.java @@ -25,20 +25,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.FieldDeclaration; -import com.github.jonathanxd.kores.base.InvokeType; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.literal.Literals; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.FieldDeclaration; +import com.koresframework.kores.base.InvokeType; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TestLoopBytecode.java b/src/test/java/com/koresframework/kores/test/asm/TestLoopBytecode.java similarity index 87% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TestLoopBytecode.java rename to src/test/java/com/koresframework/kores/test/asm/TestLoopBytecode.java index 2c48781..06c18dd 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TestLoopBytecode.java +++ b/src/test/java/com/koresframework/kores/test/asm/TestLoopBytecode.java @@ -25,28 +25,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.InvokeType; -import com.github.jonathanxd.kores.base.VariableAccess; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.operator.Operators; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.InvokeType; +import com.koresframework.kores.base.VariableAccess; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.operator.Operators; import org.junit.Test; import java.io.PrintStream; -import static com.github.jonathanxd.kores.factory.Factories.accessStaticField; -import static com.github.jonathanxd.kores.factory.VariableFactory.variable; +import static com.koresframework.kores.factory.Factories.accessStaticField; +import static com.koresframework.kores.factory.VariableFactory.variable; import static java.util.Collections.singletonList; public class TestLoopBytecode { diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/Transformer.java b/src/test/java/com/koresframework/kores/test/asm/Transformer.java similarity index 90% rename from src/test/java/com/github/jonathanxd/kores/test/asm/Transformer.java rename to src/test/java/com/koresframework/kores/test/asm/Transformer.java index 690c5ff..70b998d 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/Transformer.java +++ b/src/test/java/com/koresframework/kores/test/asm/Transformer.java @@ -25,20 +25,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.VisitLineType; -import com.github.jonathanxd.kores.bytecode.common.MethodVisitorHelper; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.bytecode.processor.KeysKt; -import com.github.jonathanxd.kores.bytecode.util.ConstsKt; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; -import com.github.jonathanxd.kores.test.InvocationsTest_; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.VisitLineType; +import com.koresframework.kores.bytecode.common.MethodVisitorHelper; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.bytecode.processor.KeysKt; +import com.koresframework.kores.bytecode.util.ConstsKt; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; +import com.koresframework.kores.test.InvocationsTest_; import com.github.jonathanxd.iutils.data.TypedData; import org.junit.Assert; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TryCatchFinallyTest.java b/src/test/java/com/koresframework/kores/test/asm/TryCatchFinallyTest.java similarity index 85% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TryCatchFinallyTest.java rename to src/test/java/com/koresframework/kores/test/asm/TryCatchFinallyTest.java index 092d7db..57a9ebe 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TryCatchFinallyTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/TryCatchFinallyTest.java @@ -25,23 +25,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; import com.github.jonathanxd.iutils.annotation.Named; -import com.github.jonathanxd.kores.Instruction; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.base.TypeSpec; -import com.github.jonathanxd.kores.bytecode.BytecodeOptions; -import com.github.jonathanxd.kores.bytecode.VisitLineType; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instruction; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.base.TypeSpec; +import com.koresframework.kores.bytecode.BytecodeOptions; +import com.koresframework.kores.bytecode.VisitLineType; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TryTest.java b/src/test/java/com/koresframework/kores/test/asm/TryTest.java similarity index 88% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TryTest.java rename to src/test/java/com/koresframework/kores/test/asm/TryTest.java index 155d964..7091f9e 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TryTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/TryTest.java @@ -25,19 +25,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.ConstructorDeclaration; -import com.github.jonathanxd.kores.base.TryStatement; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.base.TypeSpec; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.factory.VariableFactory; -import com.github.jonathanxd.kores.test.TryTest_; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.ConstructorDeclaration; +import com.koresframework.kores.base.TryStatement; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.base.TypeSpec; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.factory.VariableFactory; +import com.koresframework.kores.test.TryTest_; import com.github.jonathanxd.iutils.annotation.Named; import com.github.jonathanxd.iutils.collection.Collections3; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TryWithResourcesTest.java b/src/test/java/com/koresframework/kores/test/asm/TryWithResourcesTest.java similarity index 91% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TryWithResourcesTest.java rename to src/test/java/com/koresframework/kores/test/asm/TryWithResourcesTest.java index fb06132..b059e93 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TryWithResourcesTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/TryWithResourcesTest.java @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.test.TryWithResourcesTest_; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.test.TryWithResourcesTest_; import com.github.jonathanxd.iutils.annotation.Named; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/TypeBugTest.java b/src/test/java/com/koresframework/kores/test/asm/TypeBugTest.java similarity index 80% rename from src/test/java/com/github/jonathanxd/kores/test/asm/TypeBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/TypeBugTest.java index 2a15c0d..c465064 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/TypeBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/TypeBugTest.java @@ -25,18 +25,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.helper.Predefined; -import com.github.jonathanxd.kores.literal.Literals; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.helper.Predefined; +import com.koresframework.kores.literal.Literals; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/VariableNotDefinedBugTest.java b/src/test/java/com/koresframework/kores/test/asm/VariableNotDefinedBugTest.java similarity index 84% rename from src/test/java/com/github/jonathanxd/kores/test/asm/VariableNotDefinedBugTest.java rename to src/test/java/com/koresframework/kores/test/asm/VariableNotDefinedBugTest.java index b0dbc63..53bfc57 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/VariableNotDefinedBugTest.java +++ b/src/test/java/com/koresframework/kores/test/asm/VariableNotDefinedBugTest.java @@ -25,15 +25,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; +package com.koresframework.kores.test.asm; -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.VariableFactory; +import com.koresframework.kores.Instructions; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.VariableFactory; import org.junit.Test; diff --git a/src/test/java/com/github/jonathanxd/kores/test/asm/Wiki.java b/src/test/java/com/koresframework/kores/test/asm/Wiki.java similarity index 76% rename from src/test/java/com/github/jonathanxd/kores/test/asm/Wiki.java rename to src/test/java/com/koresframework/kores/test/asm/Wiki.java index 0cffa64..a34162a 100644 --- a/src/test/java/com/github/jonathanxd/kores/test/asm/Wiki.java +++ b/src/test/java/com/koresframework/kores/test/asm/Wiki.java @@ -25,21 +25,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm; - -import com.github.jonathanxd.kores.Instructions; -import com.github.jonathanxd.kores.Types; -import com.github.jonathanxd.kores.base.ClassDeclaration; -import com.github.jonathanxd.kores.base.KoresModifier; -import com.github.jonathanxd.kores.base.FieldDeclaration; -import com.github.jonathanxd.kores.base.MethodDeclaration; -import com.github.jonathanxd.kores.base.TypeDeclaration; -import com.github.jonathanxd.kores.bytecode.BytecodeClass; -import com.github.jonathanxd.kores.bytecode.classloader.CodeClassLoader; -import com.github.jonathanxd.kores.bytecode.processor.BytecodeGenerator; -import com.github.jonathanxd.kores.factory.Factories; -import com.github.jonathanxd.kores.factory.InvocationFactory; -import com.github.jonathanxd.kores.helper.Predefined; +package com.koresframework.kores.test.asm; + +import com.koresframework.kores.Instructions; +import com.koresframework.kores.Types; +import com.koresframework.kores.base.ClassDeclaration; +import com.koresframework.kores.base.KoresModifier; +import com.koresframework.kores.base.FieldDeclaration; +import com.koresframework.kores.base.MethodDeclaration; +import com.koresframework.kores.base.TypeDeclaration; +import com.koresframework.kores.bytecode.BytecodeClass; +import com.koresframework.kores.bytecode.classloader.CodeClassLoader; +import com.koresframework.kores.bytecode.processor.BytecodeGenerator; +import com.koresframework.kores.factory.Factories; +import com.koresframework.kores.factory.InvocationFactory; +import com.koresframework.kores.helper.Predefined; import org.junit.Test; @@ -47,12 +47,12 @@ import java.util.Collection; import java.util.List; -import static com.github.jonathanxd.kores.Types.VOID; -import static com.github.jonathanxd.kores.factory.Factories.accessStaticField; -import static com.github.jonathanxd.kores.factory.Factories.accessVariable; -import static com.github.jonathanxd.kores.factory.Factories.typeSpec; -import static com.github.jonathanxd.kores.factory.VariableFactory.variable; -import static com.github.jonathanxd.kores.literal.Literals.STRING; +import static com.koresframework.kores.Types.VOID; +import static com.koresframework.kores.factory.Factories.accessStaticField; +import static com.koresframework.kores.factory.Factories.accessVariable; +import static com.koresframework.kores.factory.Factories.typeSpec; +import static com.koresframework.kores.factory.VariableFactory.variable; +import static com.koresframework.kores.literal.Literals.STRING; import static kotlin.collections.CollectionsKt.listOf; public class Wiki { diff --git a/src/test/kotlin/com/github/jonathanxd/kores/test/asm/Base.kt b/src/test/kotlin/com/koresframework/kores/test/asm/Base.kt similarity index 97% rename from src/test/kotlin/com/github/jonathanxd/kores/test/asm/Base.kt rename to src/test/kotlin/com/koresframework/kores/test/asm/Base.kt index de3f736..b661d11 100644 --- a/src/test/kotlin/com/github/jonathanxd/kores/test/asm/Base.kt +++ b/src/test/kotlin/com/koresframework/kores/test/asm/Base.kt @@ -25,7 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.github.jonathanxd.kores.test.asm +package com.koresframework.kores.test.asm interface Base { val value: Any diff --git a/src/test/resources/disassembled/AnnotatedTest_AnnotatedTestClass_Result.class.disassembled b/src/test/resources/disassembled/AnnotatedTest_AnnotatedTestClass_Result.class.disassembled index eae5bb0..c546451 100644 --- a/src/test/resources/disassembled/AnnotatedTest_AnnotatedTestClass_Result.class.disassembled +++ b/src/test/resources/disassembled/AnnotatedTest_AnnotatedTestClass_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 61fb5469cdfe0c9aaa128f601eafcba1 +md5: e6a028d8e9bb9fda2b4450dad3739782 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -8,11 +8,11 @@ source: AnnotatedTestClass.cai !signature: null !extends: java/lang/Object !implements: [] -@com.github.jonathanxd.kores.test.AnnotatedTest_$Simple(value = {com.github.jonathanxd.kores.test.AnnotatedTest_$MyEnum.A, com.github.jonathanxd.kores.test.AnnotatedTest_$MyEnum.B, com.github.jonathanxd.kores.test.AnnotatedTest_$MyEnum.C}) +@com.koresframework.kores.test.AnnotatedTest_$Simple(value = {com.koresframework.kores.test.AnnotatedTest_$MyEnum.A, com.koresframework.kores.test.AnnotatedTest_$MyEnum.B, com.koresframework.kores.test.AnnotatedTest_$MyEnum.C}) public class test.AnnotatedTestClass extends java.lang.Object { !access: ACC_PUBLIC, ACC_STATIC (9) - @com.github.jonathanxd.kores.test.AnnotatedTest_$Simple(value = {com.github.jonathanxd.kores.test.AnnotatedTest_$MyEnum.A}) + @com.koresframework.kores.test.AnnotatedTest_$Simple(value = {com.koresframework.kores.test.AnnotatedTest_$MyEnum.A}) public static java.lang.String field !access: ACC_PUBLIC, ACC_STATIC (9) diff --git a/src/test/resources/disassembled/ArrayParameterTest_Result.class.disassembled b/src/test/resources/disassembled/ArrayParameterTest_Result.class.disassembled index 8865308..ab6025c 100644 --- a/src/test/resources/disassembled/ArrayParameterTest_Result.class.disassembled +++ b/src/test/resources/disassembled/ArrayParameterTest_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 604f9ada59ee74126eda0b5d20f7801a +md5: de3842291bec622a660c24f143811ed0 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -8,12 +8,12 @@ source: ArrayParameterTest_Generated.cai !signature: null !extends: java/lang/Object !implements: [] -public class com.github.jonathanxd.kores.test.asm.ArrayParameterTest_Generated extends java.lang.Object { +public class com.koresframework.kores.test.asm.ArrayParameterTest_Generated extends java.lang.Object { !access: ACC_PUBLIC (1) !parameter[name: par, access: (0)] - public void (com.github.jonathanxd.kores.test.asm.ArrayParameterTest$Text[]) { - desc: ([Lcom/github/jonathanxd/kores/test/asm/ArrayParameterTest$Text;)V + public void (com.koresframework.kores.test.asm.ArrayParameterTest$Text[]) { + desc: ([Lcom/koresframework/kores/test/asm/ArrayParameterTest$Text;)V maxStack: 1, maxLocals: 4 Label_0: aload 0 @@ -23,16 +23,16 @@ public class com.github.jonathanxd.kores.test.asm.ArrayParameterTest_Generated e Label_1: astore 2 aload 2 - checkcast com.github.jonathanxd.kores.test.asm.ArrayParameterTest$Text[] + checkcast com.koresframework.kores.test.asm.ArrayParameterTest$Text[] Label_2: astore 3 return Label_3: LocalVariables { - index: 3, name: lt, start: Label_2, end: Label_3, type: com.github.jonathanxd.kores.test.asm.ArrayParameterTest$Text[], signature: null + index: 3, name: lt, start: Label_2, end: Label_3, type: com.koresframework.kores.test.asm.ArrayParameterTest$Text[], signature: null index: 2, name: cf, start: Label_1, end: Label_3, type: java.lang.Object, signature: null - index: 1, name: par, start: Label_0, end: Label_3, type: com.github.jonathanxd.kores.test.asm.ArrayParameterTest$Text[], signature: null - index: 0, name: this, start: Label_0, end: Label_3, type: com.github.jonathanxd.kores.test.asm.ArrayParameterTest_Generated, signature: null + index: 1, name: par, start: Label_0, end: Label_3, type: com.koresframework.kores.test.asm.ArrayParameterTest$Text[], signature: null + index: 0, name: this, start: Label_0, end: Label_3, type: com.koresframework.kores.test.asm.ArrayParameterTest_Generated, signature: null } } diff --git a/src/test/resources/disassembled/ArrayTest_CommonGen_Generated_Result.class.disassembled b/src/test/resources/disassembled/ArrayTest_CommonGen_Generated_Result.class.disassembled index ae034b5..2499b35 100644 --- a/src/test/resources/disassembled/ArrayTest_CommonGen_Generated_Result.class.disassembled +++ b/src/test/resources/disassembled/ArrayTest_CommonGen_Generated_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: b131de14f9a6c8eae1e610f2c23714bc +md5: 51b832e8ea249ee0e08f56882b7c9858 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -8,7 +8,7 @@ source: CommonGen_Generated.cai !signature: null !extends: java/lang/Object !implements: [] -public class com.github.jonathanxd.kores.test.CommonGen_Generated extends java.lang.Object { +public class com.koresframework.kores.test.CommonGen_Generated extends java.lang.Object { !access: ACC_PUBLIC (1) public void () { @@ -108,7 +108,7 @@ public class com.github.jonathanxd.kores.test.CommonGen_Generated extends java.l index: 3, name: array3, start: Label_6, end: Label_8, type: java.lang.Object[], signature: null index: 2, name: array2, start: Label_4, end: Label_8, type: java.lang.String[], signature: null index: 1, name: array, start: Label_2, end: Label_8, type: java.lang.String[][], signature: null - index: 0, name: this, start: Label_0, end: Label_8, type: com.github.jonathanxd.kores.test.CommonGen_Generated, signature: null + index: 0, name: this, start: Label_0, end: Label_8, type: com.koresframework.kores.test.CommonGen_Generated, signature: null } } diff --git a/src/test/resources/disassembled/BridgeMethodsBugTest_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsBugTest_Result.class.disassembled index 9162dc5..baa1fe3 100644 --- a/src/test/resources/disassembled/BridgeMethodsBugTest_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsBugTest_Result.class.disassembled @@ -5,7 +5,7 @@ access: ACC_PUBLIC (33) source: bridgeBugTest.cai -public class com.bridgeBugTest extends java.lang.Object implements com.github.jonathanxd.kores.test.asm.BridgeMethodsBugTest$X { +public class com.bridgeBugTest extends java.lang.Object implements com.koresframework.kores.test.asm.BridgeMethodsBugTest$X { !access: ACC_PUBLIC (1) !signature: (Ljava/lang/Class;)TT; diff --git a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest2_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest2_Result.class.disassembled index ebd67d1..5a5e504 100644 --- a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest2_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest2_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: e82f0f85ba96ccb86956bdccf46449b2 +md5: 12a6760b87f336080e01842dd36a1354 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -7,8 +7,8 @@ source: BridgeMethodTest2.cai !signature: null !extends: java/lang/Object -!implements: [com/github/jonathanxd/kores/test/asm/BaseString] -public class com.BridgeMethodTest2 extends java.lang.Object implements com.github.jonathanxd.kores.test.asm.BaseString { +!implements: [com/koresframework/kores/test/asm/BaseString] +public class com.BridgeMethodTest2 extends java.lang.Object implements com.koresframework.kores.test.asm.BaseString { !access: ACC_PUBLIC, ACC_BRIDGE (65) public java.lang.Object getValue() { diff --git a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest3_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest3_Result.class.disassembled index 80a2dea..06c9a06 100644 --- a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest3_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest3_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 90ffd2bb861757bac0dbf797d5b9f509 +md5: b284d7cfc2d4ec9f30958d0f790bb86d version: Java 16 (60) access: ACC_PUBLIC (33) @@ -7,8 +7,8 @@ source: BridgeMethodTest3.cai !signature: null !extends: java/lang/Object -!implements: [com/github/jonathanxd/kores/test/asm/BaseGInteger] -public class com.BridgeMethodTest3 extends java.lang.Object implements com.github.jonathanxd.kores.test.asm.BaseGInteger { +!implements: [com/koresframework/kores/test/asm/BaseGInteger] +public class com.BridgeMethodTest3 extends java.lang.Object implements com.koresframework.kores.test.asm.BaseGInteger { !access: ACC_PUBLIC, ACC_BRIDGE (65) public java.lang.Number getValue() { diff --git a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest4_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest4_Result.class.disassembled index f255fad..58bdc24 100644 --- a/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest4_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsTest2_BridgeMethodTest4_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 5344e17067429a1b1ca7a1fb08e9e16c +md5: 3b65c62fe8c52de861d0cd24f57341f3 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -7,8 +7,8 @@ source: BridgeMethodTest4.cai !signature: null !extends: java/lang/Object -!implements: [com/github/jonathanxd/kores/test/asm/BaseGIntegerG] -public class com.BridgeMethodTest4 extends java.lang.Object implements com.github.jonathanxd.kores.test.asm.BaseGIntegerG { +!implements: [com/koresframework/kores/test/asm/BaseGIntegerG] +public class com.BridgeMethodTest4 extends java.lang.Object implements com.koresframework.kores.test.asm.BaseGIntegerG { !access: ACC_PUBLIC, ACC_BRIDGE (65) public java.lang.Number getValue() { diff --git a/src/test/resources/disassembled/BridgeMethodsTest3_BridgeMethodTest3_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsTest3_BridgeMethodTest3_Result.class.disassembled index 27ff668..6d1dfcd 100644 --- a/src/test/resources/disassembled/BridgeMethodsTest3_BridgeMethodTest3_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsTest3_BridgeMethodTest3_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 0262021cfa06cbccd40096a2b972c937 +md5: a08cf60130d8a35b5443b3bc34f92db7 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -7,8 +7,8 @@ source: BridgeMethodTest3.cai !signature: null !extends: java/lang/Object -!implements: [com/github/jonathanxd/kores/test/asm/BridgeMethodsTest3$StringTransform] -public class com.BridgeMethodTest3 extends java.lang.Object implements com.github.jonathanxd.kores.test.asm.BridgeMethodsTest3$StringTransform { +!implements: [com/koresframework/kores/test/asm/BridgeMethodsTest3$StringTransform] +public class com.BridgeMethodTest3 extends java.lang.Object implements com.koresframework.kores.test.asm.BridgeMethodsTest3$StringTransform { !access: ACC_PUBLIC, ACC_BRIDGE (65) !parameter[name: i, access: (0)] diff --git a/src/test/resources/disassembled/BridgeMethodsTest_Result.class.disassembled b/src/test/resources/disassembled/BridgeMethodsTest_Result.class.disassembled index 178443e..93d9d76 100644 --- a/src/test/resources/disassembled/BridgeMethodsTest_Result.class.disassembled +++ b/src/test/resources/disassembled/BridgeMethodsTest_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 548b1fae17f85d8ea7525de047939ddc +md5: 399483d38c52af901dff16c2150a6816 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -30,7 +30,7 @@ public class com.bridgeTest extends java.lang.Object implements com.AB { } !access: ACC_PUBLIC, ACC_BRIDGE (65) - !signature: (Ljava/lang/Iterable;)V + !signature: (Ljava/lang/Iterable<*>;)V !parameter[name: iter, access: (0)] public void iterate(java.lang.Iterable) { desc: (Ljava/lang/Iterable;)V diff --git a/src/test/resources/disassembled/CodeAPITestBytecode_Result.class.disassembled b/src/test/resources/disassembled/CodeAPITestBytecode_Result.class.disassembled index 10c4dff..0ff1dc6 100644 --- a/src/test/resources/disassembled/CodeAPITestBytecode_Result.class.disassembled +++ b/src/test/resources/disassembled/CodeAPITestBytecode_Result.class.disassembled @@ -13,14 +13,14 @@ public class github.com.CodeAPITestBytecode extends java.lang.Object { desc: (Ljava/lang/Object;)V maxStack: 3, maxLocals: 4 Label_0: - new com.github.jonathanxd.kores.test.asm.CodeAPITestBytecode + new com.koresframework.kores.test.asm.CodeAPITestBytecode dup - invokespecial com.github.jonathanxd.kores.test.asm.CodeAPITestBytecode.()void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.CodeAPITestBytecode.()void (ownerIsInterface: false) Label_1: astore 1 getstatic java.lang.System.out (type: java.io.PrintStream) aload 1 - getfield com.github.jonathanxd.kores.test.asm.CodeAPITestBytecode.b (type: java.lang.String) + getfield com.koresframework.kores.test.asm.CodeAPITestBytecode.b (type: java.lang.String) invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_2: aload 0 @@ -29,7 +29,7 @@ public class github.com.CodeAPITestBytecode extends java.lang.Object { aload 0 invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_3: - FRAME[type: F_APPEND, locals: 1, local: {Reference[com.github.jonathanxd.kores.test.asm.CodeAPITestBytecode]}, stacks: 0, stack: {}] + FRAME[type: F_APPEND, locals: 1, local: {Reference[com.koresframework.kores.test.asm.CodeAPITestBytecode]}, stacks: 0, stack: {}] getstatic java.lang.System.out (type: java.io.PrintStream) Label_4: astore 2 @@ -91,7 +91,7 @@ public class github.com.CodeAPITestBytecode extends java.lang.Object { index: 2, name: ref, start: Label_4, end: Label_5, type: java.lang.Object, signature: null index: 2, name: thr, start: Label_5, end: Label_7, type: java.lang.Throwable, signature: null index: 2, name: tlr, start: Label_5, end: Label_10, type: java.lang.Throwable, signature: null - index: 1, name: test, start: Label_1, end: Label_13, type: com.github.jonathanxd.kores.test.asm.CodeAPITestBytecode, signature: null + index: 1, name: test, start: Label_1, end: Label_13, type: com.koresframework.kores.test.asm.CodeAPITestBytecode, signature: null index: 0, name: msg, start: Label_0, end: Label_13, type: java.lang.Object, signature: null } } diff --git a/src/test/resources/disassembled/CodeAPITest_API_Result.class.disassembled b/src/test/resources/disassembled/CodeAPITest_API_Result.class.disassembled index d28208d..4d9163e 100644 --- a/src/test/resources/disassembled/CodeAPITest_API_Result.class.disassembled +++ b/src/test/resources/disassembled/CodeAPITest_API_Result.class.disassembled @@ -5,7 +5,7 @@ access: ACC_PUBLIC (33) source: CodeAPITest_API_Generated.cai -public class com.github.jonathanxd.kores.test.asm.CodeAPITest_API_Generated extends java.lang.Object { +public class com.koresframework.kores.test.asm.CodeAPITest_API_Generated extends java.lang.Object { !access: ACC_PUBLIC, ACC_STATIC (9) !parameter[name: string, access: (0)] @@ -33,7 +33,7 @@ public class com.github.jonathanxd.kores.test.asm.CodeAPITest_API_Generated exte return Label_1: LocalVariables { - index: 0, name: this, start: Label_0, end: Label_1, type: com.github.jonathanxd.kores.test.asm.CodeAPITest_API_Generated, signature: null + index: 0, name: this, start: Label_0, end: Label_1, type: com.koresframework.kores.test.asm.CodeAPITest_API_Generated, signature: null } } diff --git a/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled b/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled index 403e5c3..7a1f525 100644 --- a/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled +++ b/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: b2b41ef3a1f723779995af721cacad03 +md5: e08933fb17b5562b1667d1f695b1e1fc version: Java 16 (60) access: ACC_PUBLIC (33) @@ -20,7 +20,7 @@ public class test.DupTest_getNotNull extends java.lang.Object { Label_1: LINE 1 -> Label_1 getstatic java.lang.System.out (type: java.io.PrintStream) - invokestatic com.github.jonathanxd.kores.test.asm.DupTest.getNotNull()java.lang.String (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.asm.DupTest.getNotNull()java.lang.String (ownerIsInterface: false) dup ifnull Label_2 goto Label_3 diff --git a/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled b/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled index b64c024..bd30ecb 100644 --- a/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled +++ b/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 2f2893a456e37ff7d68caeb8d5bec405 +md5: 7a569199074a6ccd35bb68e68e9cef8e version: Java 16 (60) access: ACC_PUBLIC (33) @@ -20,7 +20,7 @@ public class test.DupTest_getNull extends java.lang.Object { Label_1: LINE 1 -> Label_1 getstatic java.lang.System.out (type: java.io.PrintStream) - invokestatic com.github.jonathanxd.kores.test.asm.DupTest.getNull()java.lang.String (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.asm.DupTest.getNull()java.lang.String (ownerIsInterface: false) dup ifnull Label_2 goto Label_3 diff --git a/src/test/resources/disassembled/EnumTest_MyEnum_Result.class.disassembled b/src/test/resources/disassembled/EnumTest_MyEnum_Result.class.disassembled index 66dcdab..785e8b4 100644 --- a/src/test/resources/disassembled/EnumTest_MyEnum_Result.class.disassembled +++ b/src/test/resources/disassembled/EnumTest_MyEnum_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 7d84f6e1a39b80c5b38afc229edbee88 +md5: b08b819d9d47d10750c737c0b301be11 version: Java 16 (60) access: ACC_PUBLIC, ACC_ABSTRACT (17441) @@ -7,10 +7,10 @@ source: MyEnum.cai !signature: Ljava/lang/Enum; !extends: java/lang/Enum -!implements: [com/github/jonathanxd/kores/test/EnumTest_$MyItf] +!implements: [com/koresframework/kores/test/EnumTest_$MyItf] !NestMember: com/MyEnum$A$Inner !NestMember: com/MyEnum$B$Inner -public abstract enum com.MyEnum extends java.lang.Enum implements com.github.jonathanxd.kores.test.EnumTest_$MyItf { +public abstract enum com.MyEnum extends java.lang.Enum implements com.koresframework.kores.test.EnumTest_$MyItf { inner { !access: PACKAGE_PRIVATE (16392) diff --git a/src/test/resources/disassembled/FakeElvisTest_FakeElvisTest_Result.class.disassembled b/src/test/resources/disassembled/FakeElvisTest_FakeElvisTest_Result.class.disassembled index 8708523..1fba03f 100644 --- a/src/test/resources/disassembled/FakeElvisTest_FakeElvisTest_Result.class.disassembled +++ b/src/test/resources/disassembled/FakeElvisTest_FakeElvisTest_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 26c7b9b5956eef006d900eafec212cfd +md5: b1a3940e14f744bedad7b4dd5784d713 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -12,25 +12,25 @@ public class com.FakeElvisTest extends java.lang.Object { !access: ACC_PUBLIC (1) !parameter[name: a, access: (0)] - public com.github.jonathanxd.kores.test.FakeElvisTest_$TestClass test(java.lang.String) { - desc: (Ljava/lang/String;)Lcom/github/jonathanxd/kores/test/FakeElvisTest_$TestClass; + public com.koresframework.kores.test.FakeElvisTest_$TestClass test(java.lang.String) { + desc: (Ljava/lang/String;)Lcom/koresframework/kores/test/FakeElvisTest_$TestClass; maxStack: 3, maxLocals: 2 Label_0: LINE 1 -> Label_0 - new com.github.jonathanxd.kores.test.FakeElvisTest_$TestClass + new com.koresframework.kores.test.FakeElvisTest_$TestClass dup aload 1 ifnonnull Label_1 - invokestatic com.github.jonathanxd.kores.test.FakeElvisTest_$TestClass.noti()void (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.FakeElvisTest_$TestClass.noti()void (ownerIsInterface: false) ldc "" // type: java.lang.String goto Label_2 Label_1: FRAME[type: F_FULL, locals: 2, local: {Reference[com.FakeElvisTest], Reference[java.lang.String]}, stacks: 2, stack: {Label[Label_0], Label[Label_0]}] - invokestatic com.github.jonathanxd.kores.test.FakeElvisTest_$TestClass.noti2()void (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.FakeElvisTest_$TestClass.noti2()void (ownerIsInterface: false) aload 1 Label_2: FRAME[type: F_FULL, locals: 2, local: {Reference[com.FakeElvisTest], Reference[java.lang.String]}, stacks: 3, stack: {Label[Label_0], Label[Label_0], Reference[java.lang.String]}] - invokespecial com.github.jonathanxd.kores.test.FakeElvisTest_$TestClass.(java.lang.String)void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.FakeElvisTest_$TestClass.(java.lang.String)void (ownerIsInterface: false) areturn Label_3: LocalVariables { diff --git a/src/test/resources/disassembled/FinalFieldWithThis_Test_Result.class.disassembled b/src/test/resources/disassembled/FinalFieldWithThis_Test_Result.class.disassembled index 59fead5..6fae5d7 100644 --- a/src/test/resources/disassembled/FinalFieldWithThis_Test_Result.class.disassembled +++ b/src/test/resources/disassembled/FinalFieldWithThis_Test_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: a4b60d351943583968ae9d472f7ee847 +md5: 20cdc41ee8103027b1d95069912d442b version: Java 16 (60) access: ACC_PUBLIC (33) @@ -6,12 +6,12 @@ access: ACC_PUBLIC (33) source: Test.cai !signature: null -!extends: com/github/jonathanxd/kores/test/asm/FinalFieldWithThis$TestBox +!extends: com/koresframework/kores/test/asm/FinalFieldWithThis$TestBox !implements: [] -public class finalfieldwiththis.Test extends com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox { +public class finalfieldwiththis.Test extends com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox { !access: ACC_PRIVATE, ACC_FINAL (18) - private final com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox testField + private final com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox testField !access: ACC_PUBLIC (1) public void () { @@ -21,15 +21,15 @@ public class finalfieldwiththis.Test extends com.github.jonathanxd.kores.test.as LINE 2 -> Label_0 aload 0 aconst_null - invokespecial com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox.(java.lang.Object)void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox.(java.lang.Object)void (ownerIsInterface: false) aload 0 Label_1: LINE 1 -> Label_1 - new com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox + new com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox dup aload 0 - invokespecial com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox.(java.lang.Object)void (ownerIsInterface: false) - putfield finalfieldwiththis.Test.testField (type: com.github.jonathanxd.kores.test.asm.FinalFieldWithThis$TestBox) + invokespecial com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox.(java.lang.Object)void (ownerIsInterface: false) + putfield finalfieldwiththis.Test.testField (type: com.koresframework.kores.test.asm.FinalFieldWithThis$TestBox) return Label_2: LocalVariables { diff --git a/src/test/resources/disassembled/FireEnumTest_Option_Result.class.disassembled b/src/test/resources/disassembled/FireEnumTest_Option_Result.class.disassembled index b8d9418..1c2cef0 100644 --- a/src/test/resources/disassembled/FireEnumTest_Option_Result.class.disassembled +++ b/src/test/resources/disassembled/FireEnumTest_Option_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 1e3caaf5d552027aa6a101f1b70e626d +md5: 72518da16055084f424bb20301dd677f version: Java 16 (60) access: ACC_PUBLIC (16417) @@ -49,7 +49,7 @@ public enum com.Option extends java.lang.Enum { } !access: ACC_PUBLIC, ACC_STATIC (9) - !signature: (TT;)Lcom/Option$Some; + !signature: (TT;)Lcom/Option$Some; !parameter[name: value, access: (0)] public static com.Option$Some some(java.lang.Object) { desc: (Ljava/lang/Object;)Lcom/Option$Some; diff --git a/src/test/resources/disassembled/ForEachClassTest_ForEach_Result.class.disassembled b/src/test/resources/disassembled/ForEachClassTest_ForEach_Result.class.disassembled index 763ecd9..13de230 100644 --- a/src/test/resources/disassembled/ForEachClassTest_ForEach_Result.class.disassembled +++ b/src/test/resources/disassembled/ForEachClassTest_ForEach_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 7fd8edc31c0d308825ca6d3eb72315fc +md5: 94cb5e9f62a00c3ecd304c29f022192c version: Java 16 (60) access: ACC_PUBLIC (33) @@ -11,7 +11,7 @@ source: ForEach.cai public class com.ForEach extends java.lang.Object { !access: ACC_PUBLIC (1) - !signature: (Ljava/util/List;)V + !signature: (Ljava/util/List;)V !parameter[name: strList, access: (0)] public void (java.util.List) { desc: (Ljava/util/List;)V diff --git a/src/test/resources/disassembled/IndyTest_IndyTest_Generated_Result.class.disassembled b/src/test/resources/disassembled/IndyTest_IndyTest_Generated_Result.class.disassembled index 504e2a7..c568c8a 100644 --- a/src/test/resources/disassembled/IndyTest_IndyTest_Generated_Result.class.disassembled +++ b/src/test/resources/disassembled/IndyTest_IndyTest_Generated_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: cd94923f3c6132676467a3e29004220b +md5: 37e5ffe09ed6cae08690bbba4a449943 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -50,9 +50,9 @@ public class fullName.IndyTest_Generated extends java.lang.Object { ldc "World" // type: java.lang.String invokedynamic helloWorld(java.lang.String)java.lang.String [ // Bootstrap method - com.github.jonathanxd.kores.test.asm.IndyTest.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ + com.koresframework.kores.test.asm.IndyTest.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ // Arguments - some : Ljava/lang/String; com/github/jonathanxd/kores/test/asm/IndyTest.constantBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/String; (6) [value] + some : Ljava/lang/String; com/koresframework/kores/test/asm/IndyTest.constantBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/String; (6) [value] ] ] pop @@ -61,9 +61,9 @@ public class fullName.IndyTest_Generated extends java.lang.Object { ldc "World" // type: java.lang.String invokedynamic helloWorld(java.lang.String)java.lang.String [ // Bootstrap method - com.github.jonathanxd.kores.test.asm.IndyTest.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ + com.koresframework.kores.test.asm.IndyTest.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ // Arguments - some : Ljava/lang/String; com/github/jonathanxd/kores/test/asm/IndyTest.constantBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/String; (6) [value] + some : Ljava/lang/String; com/koresframework/kores/test/asm/IndyTest.constantBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/String; (6) [value] ] ] areturn diff --git a/src/test/resources/disassembled/InvCall_Result.class.disassembled b/src/test/resources/disassembled/InvCall_Result.class.disassembled index 5eaa7e9..0bebb08 100644 --- a/src/test/resources/disassembled/InvCall_Result.class.disassembled +++ b/src/test/resources/disassembled/InvCall_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 9cc9b8e16de214260ee66719de6d620c +md5: 7866f5d67a4959a2762566b2b25d1b54 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -6,9 +6,9 @@ access: ACC_PUBLIC (33) source: Impl.cai !signature: null -!extends: com/github/jonathanxd/kores/test/asm/InvCall$My +!extends: com/koresframework/kores/test/asm/InvCall$My !implements: [] -public class test.Impl extends com.github.jonathanxd.kores.test.asm.InvCall$My { +public class test.Impl extends com.koresframework.kores.test.asm.InvCall$My { !access: ACC_PUBLIC (1) public void () { @@ -20,7 +20,7 @@ public class test.Impl extends com.github.jonathanxd.kores.test.asm.InvCall$My { astore 1 aload 0 aload 1 - invokespecial com.github.jonathanxd.kores.test.asm.InvCall$My.(java.lang.String)void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.InvCall$My.(java.lang.String)void (ownerIsInterface: false) return Label_2: LocalVariables { diff --git a/src/test/resources/disassembled/InvokeSuperConstructorBugTest_InvokeSuperConstructor_Result.class.disassembled b/src/test/resources/disassembled/InvokeSuperConstructorBugTest_InvokeSuperConstructor_Result.class.disassembled index a280d0a..8eb2cc3 100644 --- a/src/test/resources/disassembled/InvokeSuperConstructorBugTest_InvokeSuperConstructor_Result.class.disassembled +++ b/src/test/resources/disassembled/InvokeSuperConstructorBugTest_InvokeSuperConstructor_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 87eb53ea152be420537d97a768867b48 +md5: d6ae18cbc260a66c2c649d32ec351c24 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -6,9 +6,9 @@ access: ACC_PUBLIC (33) source: InvokeSuperConstructor.cai !signature: null -!extends: com/github/jonathanxd/kores/test/asm/InvokeSuperConstructorBugTest$ClassWithConstructor +!extends: com/koresframework/kores/test/asm/InvokeSuperConstructorBugTest$ClassWithConstructor !implements: [] -public class com.InvokeSuperConstructor extends com.github.jonathanxd.kores.test.asm.InvokeSuperConstructorBugTest$ClassWithConstructor { +public class com.InvokeSuperConstructor extends com.koresframework.kores.test.asm.InvokeSuperConstructorBugTest$ClassWithConstructor { !access: ACC_PUBLIC (1) public void () { @@ -18,7 +18,7 @@ public class com.InvokeSuperConstructor extends com.github.jonathanxd.kores.test LINE 1 -> Label_0 aload 0 ldc "Hello" // type: java.lang.String - invokespecial com.github.jonathanxd.kores.test.asm.InvokeSuperConstructorBugTest$ClassWithConstructor.(java.lang.String)void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.InvokeSuperConstructorBugTest$ClassWithConstructor.(java.lang.String)void (ownerIsInterface: false) return Label_1: LocalVariables { diff --git a/src/test/resources/disassembled/InvokeSuperTest_Result.class.disassembled b/src/test/resources/disassembled/InvokeSuperTest_Result.class.disassembled index df9ba36..93afa23 100644 --- a/src/test/resources/disassembled/InvokeSuperTest_Result.class.disassembled +++ b/src/test/resources/disassembled/InvokeSuperTest_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 1e6a9a9338bd3ace2bd1c76b49d9bc5b +md5: 0998e1a784da55edaac5589e7ff0466e version: Java 16 (60) access: ACC_PUBLIC (33) @@ -6,9 +6,9 @@ access: ACC_PUBLIC (33) source: Impl.cai !signature: null -!extends: com/github/jonathanxd/kores/test/asm/InvokeSuperTest$My +!extends: com/koresframework/kores/test/asm/InvokeSuperTest$My !implements: [] -public class test.Impl extends com.github.jonathanxd.kores.test.asm.InvokeSuperTest$My { +public class test.Impl extends com.koresframework.kores.test.asm.InvokeSuperTest$My { !access: ACC_PUBLIC (1) public void () { @@ -20,7 +20,7 @@ public class test.Impl extends com.github.jonathanxd.kores.test.asm.InvokeSuperT astore 1 aload 0 aload 1 - invokespecial com.github.jonathanxd.kores.test.asm.InvokeSuperTest$My.(java.lang.String)void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.InvokeSuperTest$My.(java.lang.String)void (ownerIsInterface: false) return Label_2: LocalVariables { diff --git a/src/test/resources/disassembled/KoresTestBytecode_Result.class.disassembled b/src/test/resources/disassembled/KoresTestBytecode_Result.class.disassembled index 91e20f3..f0f7992 100644 --- a/src/test/resources/disassembled/KoresTestBytecode_Result.class.disassembled +++ b/src/test/resources/disassembled/KoresTestBytecode_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 6d93800b5509acb415498979a300b1de +md5: 14c4a08c73a7e2e8e8aae35965716ad9 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -16,14 +16,14 @@ public class github.com.KoresTestBytecode extends java.lang.Object { desc: (Ljava/lang/Object;)V maxStack: 3, maxLocals: 4 Label_0: - new com.github.jonathanxd.kores.test.asm.KoresTestBytecode + new com.koresframework.kores.test.asm.KoresTestBytecode dup - invokespecial com.github.jonathanxd.kores.test.asm.KoresTestBytecode.()void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.asm.KoresTestBytecode.()void (ownerIsInterface: false) Label_1: astore 1 getstatic java.lang.System.out (type: java.io.PrintStream) aload 1 - getfield com.github.jonathanxd.kores.test.asm.KoresTestBytecode.b (type: java.lang.String) + getfield com.koresframework.kores.test.asm.KoresTestBytecode.b (type: java.lang.String) invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_2: aload 0 @@ -32,7 +32,7 @@ public class github.com.KoresTestBytecode extends java.lang.Object { aload 0 invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_3: - FRAME[type: F_APPEND, locals: 1, local: {Reference[com.github.jonathanxd.kores.test.asm.KoresTestBytecode]}, stacks: 0, stack: {}] + FRAME[type: F_APPEND, locals: 1, local: {Reference[com.koresframework.kores.test.asm.KoresTestBytecode]}, stacks: 0, stack: {}] getstatic java.lang.System.out (type: java.io.PrintStream) Label_4: astore 2 @@ -94,7 +94,7 @@ public class github.com.KoresTestBytecode extends java.lang.Object { index: 2, name: ref, start: Label_4, end: Label_5, type: java.lang.Object, signature: null index: 2, name: thr, start: Label_5, end: Label_7, type: java.lang.Throwable, signature: null index: 2, name: tlr, start: Label_5, end: Label_10, type: java.lang.Throwable, signature: null - index: 1, name: test, start: Label_1, end: Label_13, type: com.github.jonathanxd.kores.test.asm.KoresTestBytecode, signature: null + index: 1, name: test, start: Label_1, end: Label_13, type: com.koresframework.kores.test.asm.KoresTestBytecode, signature: null index: 0, name: msg, start: Label_0, end: Label_13, type: java.lang.Object, signature: null } } diff --git a/src/test/resources/disassembled/KoresTest_API_Result.class.disassembled b/src/test/resources/disassembled/KoresTest_API_Result.class.disassembled index 2f69065..fa8c3cf 100644 --- a/src/test/resources/disassembled/KoresTest_API_Result.class.disassembled +++ b/src/test/resources/disassembled/KoresTest_API_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: cbab5e0af98210f44eeb2039a5ac81fa +md5: 174e21ce6289a9a1b3f2b7ef7602480d version: Java 16 (60) access: ACC_PUBLIC (33) @@ -8,7 +8,7 @@ source: KoresTest_API_Generated.cai !signature: null !extends: java/lang/Object !implements: [] -public class com.github.jonathanxd.kores.test.asm.KoresTest_API_Generated extends java.lang.Object { +public class com.koresframework.kores.test.asm.KoresTest_API_Generated extends java.lang.Object { !access: ACC_PUBLIC, ACC_STATIC (9) !parameter[name: string, access: (0)] @@ -36,7 +36,7 @@ public class com.github.jonathanxd.kores.test.asm.KoresTest_API_Generated extend return Label_1: LocalVariables { - index: 0, name: this, start: Label_0, end: Label_1, type: com.github.jonathanxd.kores.test.asm.KoresTest_API_Generated, signature: null + index: 0, name: this, start: Label_0, end: Label_1, type: com.koresframework.kores.test.asm.KoresTest_API_Generated, signature: null } } diff --git a/src/test/resources/disassembled/PrimitiveCast_Result.class.disassembled b/src/test/resources/disassembled/PrimitiveCast_Result.class.disassembled index c98d683..c2a12b8 100644 --- a/src/test/resources/disassembled/PrimitiveCast_Result.class.disassembled +++ b/src/test/resources/disassembled/PrimitiveCast_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: c9e913301f8468d261ef32d6d37ebdee +md5: d5cfae24a0eb2db88920bf21faf22a7f version: Java 16 (60) access: ACC_PUBLIC (33) @@ -8,7 +8,7 @@ source: PrimitiveCast_Generated.cai !signature: null !extends: java/lang/Object !implements: [] -public class com.github.jonathanxd.kores.test.asm.PrimitiveCast_Generated extends java.lang.Object { +public class com.koresframework.kores.test.asm.PrimitiveCast_Generated extends java.lang.Object { !access: ACC_PUBLIC, ACC_STATIC (9) !parameter[name: string, access: (0)] @@ -87,7 +87,7 @@ public class com.github.jonathanxd.kores.test.asm.PrimitiveCast_Generated extend return Label_1: LocalVariables { - index: 0, name: this, start: Label_0, end: Label_1, type: com.github.jonathanxd.kores.test.asm.PrimitiveCast_Generated, signature: null + index: 0, name: this, start: Label_0, end: Label_1, type: com.koresframework.kores.test.asm.PrimitiveCast_Generated, signature: null } } diff --git a/src/test/resources/disassembled/RecursiveGenericTypeTest_MyClass_Result.class.disassembled b/src/test/resources/disassembled/RecursiveGenericTypeTest_MyClass_Result.class.disassembled index d775c43..d697e25 100644 --- a/src/test/resources/disassembled/RecursiveGenericTypeTest_MyClass_Result.class.disassembled +++ b/src/test/resources/disassembled/RecursiveGenericTypeTest_MyClass_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: fda731fa9599440f87879e0bd1dc820f +md5: 69a5410fffbc379703de568852f6b9db version: Java 16 (60) access: ACC_PUBLIC (33) @@ -17,7 +17,7 @@ public class com.MyClass extends java.lang.Object { private static final java.util.Map f2 !access: ACC_PUBLIC (1) - !signature: (Ljava/lang/reflect/Type;TE;TM;)V + !signature: (Ljava/lang/reflect/Type;TE;M;>;)V !parameter[name: type, access: (0)] !parameter[name: x, access: (0)] !parameter[name: test, access: (0)] diff --git a/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled index cafbbe4..65d4e48 100644 --- a/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled +++ b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled @@ -38,13 +38,13 @@ source: SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$ static void () { desc: ()V maxStack: 3, maxLocals: 1 - invokestatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.values()com.github.jonathanxd.kores.test.SwitchTest_$TestEnum[] (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.SwitchTest_$TestEnum.values()com.koresframework.kores.test.SwitchTest_$TestEnum[] (ownerIsInterface: false) arraylength newarray 10 putstatic com.SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) Label_0: getstatic com.SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) - getstatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.A (type: com.github.jonathanxd.kores.test.SwitchTest_$TestEnum) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.A (type: com.koresframework.kores.test.SwitchTest_$TestEnum) invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) iconst_1 iastore @@ -57,7 +57,7 @@ source: SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$ Label_3: FRAME[type: F_SAME, locals: 0, local: {}, stacks: 0, stack: {}] getstatic com.SwitchTestClass$com_github_jonathanxd_codeapi_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) - getstatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.B (type: com.github.jonathanxd.kores.test.SwitchTest_$TestEnum) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.B (type: com.koresframework.kores.test.SwitchTest_$TestEnum) invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) iconst_2 iastore diff --git a/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled index 743ecf6..01cb412 100644 --- a/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled +++ b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled @@ -44,13 +44,13 @@ class com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$ static void () { desc: ()V maxStack: 3, maxLocals: 1 - invokestatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.values()com.github.jonathanxd.kores.test.SwitchTest_$TestEnum[] (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.SwitchTest_$TestEnum.values()com.koresframework.kores.test.SwitchTest_$TestEnum[] (ownerIsInterface: false) arraylength newarray 10 putstatic com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) Label_0: getstatic com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) - getstatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.A (type: com.github.jonathanxd.kores.test.SwitchTest_$TestEnum) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.A (type: com.koresframework.kores.test.SwitchTest_$TestEnum) invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) iconst_1 iastore @@ -63,7 +63,7 @@ class com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$ Label_3: FRAME[type: F_SAME, locals: 0, local: {}, stacks: 0, stack: {}] getstatic com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) - getstatic com.github.jonathanxd.kores.test.SwitchTest_$TestEnum.B (type: com.github.jonathanxd.kores.test.SwitchTest_$TestEnum) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.B (type: com.koresframework.kores.test.SwitchTest_$TestEnum) invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) iconst_2 iastore diff --git a/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled new file mode 100644 index 0000000..637f89f --- /dev/null +++ b/src/test/resources/disassembled/SwitchTest_SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings_Result.class.disassembled @@ -0,0 +1,85 @@ +md5: a6f8bdfc2c889dceb2fe48a0b1a1f3ad + +version: Java 16 (60) +access: PACKAGE_PRIVATE, ACC_SYNTHETIC (4128) + +source: SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.cai + +!signature: null +!extends: java/lang/Object +!implements: [] +!NestHost: com/SwitchTestClass +class com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings extends java.lang.Object { + + inner { + !access: PACKAGE_PRIVATE, ACC_SYNTHETIC (4096) + com.SwitchTestClass.com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings -> com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings + } + + !access: ACC_PROTECTED, ACC_FINAL, ACC_SYNTHETIC (4116) + protected final com.SwitchTestClass outer$ + !access: PACKAGE_PRIVATE, ACC_STATIC (8) + static int[] ENUM_MAP + + !access: PACKAGE_PRIVATE (0) + !parameter[name: outer$, access: (0)] + void (com.SwitchTestClass) { + desc: (Lcom/SwitchTestClass;)V + maxStack: 2, maxLocals: 2 + Label_0: + aload 0 + invokespecial java.lang.Object.()void (ownerIsInterface: false) + aload 0 + aload 1 + putfield com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.outer$ (type: com.SwitchTestClass) + return + Label_1: + LocalVariables { + index: 1, name: outer$, start: Label_0, end: Label_1, type: com.SwitchTestClass, signature: null + index: 0, name: this, start: Label_0, end: Label_1, type: com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings, signature: null + } + } + + !access: PACKAGE_PRIVATE, ACC_STATIC (8) + static void () { + desc: ()V + maxStack: 3, maxLocals: 1 + invokestatic com.koresframework.kores.test.SwitchTest_$TestEnum.values()com.koresframework.kores.test.SwitchTest_$TestEnum[] (ownerIsInterface: false) + arraylength + newarray 10 + putstatic com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) + Label_0: + getstatic com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.A (type: com.koresframework.kores.test.SwitchTest_$TestEnum) + invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) + iconst_1 + iastore + Label_1: + goto Label_3 + Label_2: + FRAME[type: F_SAME1, locals: 0, local: {}, stacks: 1, stack: {Reference[java.lang.NoSuchFieldError]}] + astore 0 + goto Label_3 + Label_3: + FRAME[type: F_SAME, locals: 0, local: {}, stacks: 0, stack: {}] + getstatic com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) + getstatic com.koresframework.kores.test.SwitchTest_$TestEnum.B (type: com.koresframework.kores.test.SwitchTest_$TestEnum) + invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) + iconst_2 + iastore + Label_4: + return + Label_5: + FRAME[type: F_SAME1, locals: 0, local: {}, stacks: 1, stack: {Reference[java.lang.NoSuchFieldError]}] + astore 0 + return + Label_6: + FRAME[type: F_SAME1, locals: 0, local: {}, stacks: 1, stack: {Reference[java.lang.Throwable]}] + athrow + TryCatchBlocks { + start: Label_0, end: Label_1, handler: Label_2, exception: java.lang.NoSuchFieldError + start: Label_3, end: Label_4, handler: Label_5, exception: java.lang.NoSuchFieldError + } + } + +} \ No newline at end of file diff --git a/src/test/resources/disassembled/SwitchTest_SwitchTestClass_Result.class.disassembled b/src/test/resources/disassembled/SwitchTest_SwitchTestClass_Result.class.disassembled index de5ba83..ab3b675 100644 --- a/src/test/resources/disassembled/SwitchTest_SwitchTestClass_Result.class.disassembled +++ b/src/test/resources/disassembled/SwitchTest_SwitchTestClass_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 0ce6ac0c27c53392b49bdc48961d9876 +md5: 47c84c962f327b6cc8b68e5bc4762832 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -12,7 +12,7 @@ public class com.SwitchTestClass extends java.lang.Object { inner { !access: PACKAGE_PRIVATE, ACC_SYNTHETIC (4096) - com.SwitchTestClass.com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings -> com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings + com.SwitchTestClass.com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings -> com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings } !access: ACC_PUBLIC (1) @@ -21,8 +21,8 @@ public class com.SwitchTestClass extends java.lang.Object { !parameter[name: testEnum, access: (0)] !parameter[name: str, access: (0)] !parameter[name: o, access: (0)] - public void (int, int, com.github.jonathanxd.kores.test.SwitchTest_$TestEnum, java.lang.String, java.lang.Object) { - desc: (IILcom/github/jonathanxd/kores/test/SwitchTest_$TestEnum;Ljava/lang/String;Ljava/lang/Object;)V + public void (int, int, com.koresframework.kores.test.SwitchTest_$TestEnum, java.lang.String, java.lang.Object) { + desc: (IILcom/koresframework/kores/test/SwitchTest_$TestEnum;Ljava/lang/String;Ljava/lang/Object;)V maxStack: 2, maxLocals: 6 Label_0: aload 0 @@ -40,7 +40,7 @@ public class com.SwitchTestClass extends java.lang.Object { } Label_2: LINE 2 -> Label_2 - FRAME[type: F_FULL, locals: 6, local: {Reference[com.SwitchTestClass], Primitive[integer], Primitive[integer], Reference[com.github.jonathanxd.kores.test.SwitchTest_$TestEnum], Reference[java.lang.String], Reference[java.lang.Object]}, stacks: 0, stack: {}] + FRAME[type: F_FULL, locals: 6, local: {Reference[com.SwitchTestClass], Primitive[integer], Primitive[integer], Reference[com.koresframework.kores.test.SwitchTest_$TestEnum], Reference[java.lang.String], Reference[java.lang.Object]}, stacks: 0, stack: {}] getstatic java.lang.System.out (type: java.io.PrintStream) ldc "1" // type: java.lang.String invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) @@ -114,7 +114,7 @@ public class com.SwitchTestClass extends java.lang.Object { Label_16: LINE 16 -> Label_16 FRAME[type: F_SAME, locals: 0, local: {}, stacks: 0, stack: {}] - getstatic com.SwitchTestClass$com_github_jonathanxd_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) + getstatic com.SwitchTestClass$com_koresframework_kores_test_SwitchTest__TestEnum$SwitchOnEnum$Mappings.ENUM_MAP (type: int[]) aload 3 invokevirtual java.lang.Enum.ordinal()int (ownerIsInterface: false) iaload @@ -208,7 +208,7 @@ public class com.SwitchTestClass extends java.lang.Object { LocalVariables { index: 5, name: o, start: Label_0, end: Label_32, type: java.lang.Object, signature: null index: 4, name: str, start: Label_0, end: Label_32, type: java.lang.String, signature: null - index: 3, name: testEnum, start: Label_0, end: Label_32, type: com.github.jonathanxd.kores.test.SwitchTest_$TestEnum, signature: null + index: 3, name: testEnum, start: Label_0, end: Label_32, type: com.koresframework.kores.test.SwitchTest_$TestEnum, signature: null index: 2, name: number2, start: Label_0, end: Label_32, type: int, signature: null index: 1, name: number, start: Label_0, end: Label_32, type: int, signature: null index: 0, name: this, start: Label_0, end: Label_32, type: com.SwitchTestClass, signature: null diff --git a/src/test/resources/disassembled/TestBytecode_Invocations_InvocationsTest__Generated_Result.class.disassembled b/src/test/resources/disassembled/TestBytecode_Invocations_InvocationsTest__Generated_Result.class.disassembled index 5ed508e..8901f39 100644 --- a/src/test/resources/disassembled/TestBytecode_Invocations_InvocationsTest__Generated_Result.class.disassembled +++ b/src/test/resources/disassembled/TestBytecode_Invocations_InvocationsTest__Generated_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 3119fdc5b35aa46dfe5add99e9977c87 +md5: c537d6a74c30fd6af05e27c9fbfbe12d version: Java 16 (60) access: ACC_PUBLIC (33) @@ -93,7 +93,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { LINE 6 -> Label_0 ldc "xy" // type: java.lang.String ldc "yz" // type: java.lang.String - invokestatic com.github.jonathanxd.kores.test.InvocationsTest_.bmp(java.lang.String, java.lang.String)void (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.InvocationsTest_.bmp(java.lang.String, java.lang.String)void (ownerIsInterface: false) Label_1: LINE 7 -> Label_1 getstatic java.lang.System.out (type: java.io.PrintStream) @@ -101,15 +101,15 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_2: LINE 8 -> Label_2 - new com.github.jonathanxd.kores.test.WorldGreeter + new com.koresframework.kores.test.WorldGreeter dup - invokespecial com.github.jonathanxd.kores.test.WorldGreeter.()void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.WorldGreeter.()void (ownerIsInterface: false) Label_3: astore 2 Label_4: LINE 9 -> Label_4 aload 2 - invokeinterface com.github.jonathanxd.kores.test.Greeter.hello()java.lang.String (ownerIsInterface: true) + invokeinterface com.koresframework.kores.test.Greeter.hello()java.lang.String (ownerIsInterface: true) Label_5: astore 3 Label_6: @@ -150,12 +150,12 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { Label_12: LINE 15 -> Label_12 aload 2 - invokedynamic get(com.github.jonathanxd.kores.test.Greeter)java.util.function.Supplier [ + invokedynamic get(com.koresframework.kores.test.Greeter)java.util.function.Supplier [ // Bootstrap method java.lang.invoke.LambdaMetafactory.metafactory(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.invoke.MethodType)java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ // Arguments ()Ljava/lang/Object; - com.github.jonathanxd.kores.test.Greeter.hello()java.lang.String (tag: h_invokeinterface, itf: true) + com.koresframework.kores.test.Greeter.hello()java.lang.String (tag: h_invokeinterface, itf: true) ()Ljava/lang/String; ] ] @@ -188,7 +188,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { ldc "World" // type: java.lang.String invokedynamic helloWorld(java.lang.String)void [ // Bootstrap method - com.github.jonathanxd.kores.test.InvocationsTest_.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ + com.koresframework.kores.test.InvocationsTest_.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ ] ] Label_20: @@ -206,7 +206,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { if_icmpne Label_23 Label_22: LINE 23 -> Label_22 - FRAME[type: F_FULL, locals: 7, local: {Reference[fullName.InvocationsTest__Generated], Primitive[integer], Reference[com.github.jonathanxd.kores.test.WorldGreeter], Reference[java.lang.String], Reference[java.util.function.Supplier], Reference[java.util.function.Supplier], Reference[java.lang.String]}, stacks: 0, stack: {}] + FRAME[type: F_FULL, locals: 7, local: {Reference[fullName.InvocationsTest__Generated], Primitive[integer], Reference[com.koresframework.kores.test.WorldGreeter], Reference[java.lang.String], Reference[java.util.function.Supplier], Reference[java.util.function.Supplier], Reference[java.lang.String]}, stacks: 0, stack: {}] iconst_0 ireturn Label_23: @@ -229,7 +229,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { index: 5, name: supplier, start: Label_13, end: Label_25, type: java.util.function.Supplier, signature: null index: 4, name: supplier2, start: Label_10, end: Label_25, type: java.util.function.Supplier, signature: null index: 3, name: greetingVar, start: Label_5, end: Label_25, type: java.lang.String, signature: null - index: 2, name: greeter, start: Label_3, end: Label_25, type: com.github.jonathanxd.kores.test.Greeter, signature: null + index: 2, name: greeter, start: Label_3, end: Label_25, type: com.koresframework.kores.test.Greeter, signature: null index: 1, name: x, start: Label_0, end: Label_25, type: int, signature: null index: 0, name: this, start: Label_0, end: Label_25, type: fullName.InvocationsTest__Generated, signature: null } diff --git a/src/test/resources/disassembled/Transformer_Result.class.disassembled b/src/test/resources/disassembled/Transformer_Result.class.disassembled index 892e2b7..d38f368 100644 --- a/src/test/resources/disassembled/Transformer_Result.class.disassembled +++ b/src/test/resources/disassembled/Transformer_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 59ac21757ae831934cd6c1659ddcc84f +md5: bfdab39bf0007061b9c89e54e04d920f version: Java 8 (52) access: ACC_PUBLIC (33) @@ -96,7 +96,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { LINE 8 -> Label_0 ldc "xy" // type: java.lang.String ldc "yz" // type: java.lang.String - invokestatic com.github.jonathanxd.kores.test.InvocationsTest_.bmp(java.lang.String, java.lang.String)void (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.InvocationsTest_.bmp(java.lang.String, java.lang.String)void (ownerIsInterface: false) Label_1: LINE 9 -> Label_1 getstatic java.lang.System.out (type: java.io.PrintStream) @@ -104,15 +104,15 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false) Label_2: LINE 10 -> Label_2 - new com.github.jonathanxd.kores.test.WorldGreeter + new com.koresframework.kores.test.WorldGreeter dup - invokespecial com.github.jonathanxd.kores.test.WorldGreeter.()void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.WorldGreeter.()void (ownerIsInterface: false) Label_3: astore 2 Label_4: LINE 11 -> Label_4 aload 2 - invokeinterface com.github.jonathanxd.kores.test.Greeter.hello()java.lang.String (ownerIsInterface: true) + invokeinterface com.koresframework.kores.test.Greeter.hello()java.lang.String (ownerIsInterface: true) Label_5: astore 3 Label_6: @@ -153,12 +153,12 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { Label_12: LINE 17 -> Label_12 aload 2 - invokedynamic get(com.github.jonathanxd.kores.test.Greeter)java.util.function.Supplier [ + invokedynamic get(com.koresframework.kores.test.Greeter)java.util.function.Supplier [ // Bootstrap method java.lang.invoke.LambdaMetafactory.metafactory(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.invoke.MethodType)java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ // Arguments ()Ljava/lang/Object; - com.github.jonathanxd.kores.test.Greeter.hello()java.lang.String (tag: h_invokeinterface, itf: true) + com.koresframework.kores.test.Greeter.hello()java.lang.String (tag: h_invokeinterface, itf: true) ()Ljava/lang/String; ] ] @@ -191,7 +191,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { ldc "World" // type: java.lang.String invokedynamic helloWorld(java.lang.String)void [ // Bootstrap method - com.github.jonathanxd.kores.test.InvocationsTest_.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ + com.koresframework.kores.test.InvocationsTest_.myBootstrap(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.Object[])java.lang.invoke.CallSite (tag: h_invokestatic, itf: false) [ ] ] Label_20: @@ -209,7 +209,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { if_icmpne Label_23 Label_22: LINE 28 -> Label_22 - FRAME[type: F_FULL, locals: 7, local: {Reference[fullName.InvocationsTest__Generated], Primitive[integer], Reference[com.github.jonathanxd.kores.test.WorldGreeter], Reference[java.lang.String], Reference[java.util.function.Supplier], Reference[java.util.function.Supplier], Reference[java.lang.String]}, stacks: 0, stack: {}] + FRAME[type: F_FULL, locals: 7, local: {Reference[fullName.InvocationsTest__Generated], Primitive[integer], Reference[com.koresframework.kores.test.WorldGreeter], Reference[java.lang.String], Reference[java.util.function.Supplier], Reference[java.util.function.Supplier], Reference[java.lang.String]}, stacks: 0, stack: {}] iconst_0 ireturn Label_23: @@ -232,7 +232,7 @@ public class fullName.InvocationsTest__Generated extends java.lang.Object { index: 5, name: supplier, start: Label_13, end: Label_25, type: java.util.function.Supplier, signature: null index: 4, name: supplier2, start: Label_10, end: Label_25, type: java.util.function.Supplier, signature: null index: 3, name: greetingVar, start: Label_5, end: Label_25, type: java.lang.String, signature: null - index: 2, name: greeter, start: Label_3, end: Label_25, type: com.github.jonathanxd.kores.test.Greeter, signature: null + index: 2, name: greeter, start: Label_3, end: Label_25, type: com.koresframework.kores.test.Greeter, signature: null index: 1, name: x, start: Label_0, end: Label_25, type: int, signature: null index: 0, name: this, start: Label_0, end: Label_25, type: fullName.InvocationsTest__Generated, signature: null } diff --git a/src/test/resources/disassembled/TryTest_TryCatchFinally_Result.class.disassembled b/src/test/resources/disassembled/TryTest_TryCatchFinally_Result.class.disassembled index 5f87caa..aafbd1f 100644 --- a/src/test/resources/disassembled/TryTest_TryCatchFinally_Result.class.disassembled +++ b/src/test/resources/disassembled/TryTest_TryCatchFinally_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: 38ec002ecca92ee907942a24c54c389f +md5: 6f5e39d802128470ea5e0eebc2eda8db version: Java 16 (60) access: ACC_PUBLIC (33) @@ -20,7 +20,7 @@ public class test.TryCatchFinally extends java.lang.Object { Label_1: LINE 1 -> Label_1 LINE 2 -> Label_1 - invokestatic com.github.jonathanxd.kores.test.TryTest_.boom()void (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.TryTest_.boom()void (ownerIsInterface: false) Label_2: return Label_3: @@ -32,7 +32,7 @@ public class test.TryCatchFinally extends java.lang.Object { invokevirtual java.lang.Exception.printStackTrace()void (ownerIsInterface: false) Label_5: LINE 4 -> Label_5 - invokestatic com.github.jonathanxd.kores.test.asm.TryTest.x()java.lang.String (ownerIsInterface: false) + invokestatic com.koresframework.kores.test.asm.TryTest.x()java.lang.String (ownerIsInterface: false) pop Label_6: return diff --git a/src/test/resources/disassembled/TryWithResourcesTest_TryWithResourcesTestClass_Result.class.disassembled b/src/test/resources/disassembled/TryWithResourcesTest_TryWithResourcesTestClass_Result.class.disassembled index daafd33..44d3fa4 100644 --- a/src/test/resources/disassembled/TryWithResourcesTest_TryWithResourcesTestClass_Result.class.disassembled +++ b/src/test/resources/disassembled/TryWithResourcesTest_TryWithResourcesTestClass_Result.class.disassembled @@ -1,4 +1,4 @@ -md5: b730bb229ff0c3bc5739a4ff0b1d6b0b +md5: 72de52af6a47e2741e010a326eee1742 version: Java 16 (60) access: ACC_PUBLIC (33) @@ -19,9 +19,9 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { invokespecial java.lang.Object.()void (ownerIsInterface: false) Label_1: LINE 1 -> Label_1 - new com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm + new com.koresframework.kores.test.TryWithResourcesTest_$Trm dup - invokespecial com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm.()void (ownerIsInterface: false) + invokespecial com.koresframework.kores.test.TryWithResourcesTest_$Trm.()void (ownerIsInterface: false) Label_2: astore 1 aconst_null @@ -30,7 +30,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { Label_4: LINE 2 -> Label_4 aload 1 - invokevirtual com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm.read()void (ownerIsInterface: false) + invokevirtual com.koresframework.kores.test.TryWithResourcesTest_$Trm.read()void (ownerIsInterface: false) Label_5: aload 1 ifnull Label_22 @@ -42,7 +42,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { Label_7: return Label_8: - FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] + FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] astore 3 aload 2 aload 3 @@ -53,7 +53,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { FRAME[type: F_FULL, locals: 0, local: {}, stacks: 1, stack: {Reference[java.lang.Throwable]}] athrow Label_11: - FRAME[type: F_APPEND, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 0, stack: {}] + FRAME[type: F_APPEND, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 0, stack: {}] aload 1 invokeinterface java.lang.AutoCloseable.close()void (ownerIsInterface: true) Label_12: @@ -66,7 +66,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { aload 3 athrow Label_14: - FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] + FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] astore 4 aload 1 ifnull Label_21 @@ -78,7 +78,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { Label_16: goto Label_21 Label_17: - FRAME[type: F_FULL, locals: 5, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable], Primitive[top], Reference[java.lang.Throwable]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] + FRAME[type: F_FULL, locals: 5, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable], Primitive[top], Reference[java.lang.Throwable]}, stacks: 1, stack: {Reference[java.lang.Throwable]}] astore 5 aload 2 aload 5 @@ -91,7 +91,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { nop athrow Label_20: - FRAME[type: F_FULL, locals: 5, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable], Primitive[top], Reference[java.lang.Throwable]}, stacks: 0, stack: {}] + FRAME[type: F_FULL, locals: 5, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Reference[java.lang.Throwable], Primitive[top], Reference[java.lang.Throwable]}, stacks: 0, stack: {}] aload 1 invokeinterface java.lang.AutoCloseable.close()void (ownerIsInterface: true) Label_21: @@ -99,7 +99,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { aload 4 athrow Label_22: - FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 0, stack: {}] + FRAME[type: F_FULL, locals: 3, local: {Reference[test.TryWithResourcesTestClass], Reference[com.koresframework.kores.test.TryWithResourcesTest_$Trm], Primitive[null]}, stacks: 0, stack: {}] return Label_23: TryCatchBlocks { @@ -116,7 +116,7 @@ public class test.TryWithResourcesTestClass extends java.lang.Object { index: 3, name: $catch_2_, start: Label_8, end: Label_9, type: java.lang.Throwable, signature: null index: 3, name: $catch_, start: Label_13, end: Label_14, type: java.lang.Throwable, signature: null index: 2, name: $throwable_, start: Label_3, end: Label_23, type: java.lang.Throwable, signature: null - index: 1, name: trm, start: Label_2, end: Label_23, type: com.github.jonathanxd.kores.test.TryWithResourcesTest_$Trm, signature: null + index: 1, name: trm, start: Label_2, end: Label_23, type: com.koresframework.kores.test.TryWithResourcesTest_$Trm, signature: null index: 0, name: this, start: Label_0, end: Label_23, type: test.TryWithResourcesTestClass, signature: null } }