Added Dup and Pop code parts and changed version template: koresframework/Kores#46

JonathanxD · JonathanxD · commit 3e3e472842c5 · 2017-02-24T13:01:51.000-03:00
diff --git a/build.gradle b/build.gradle
@@ -18,14 +18,14 @@ buildscript {
 }
 
 group 'com.github.jonathanxd'
-version '3.1.1'
+version '3.1.0-3.1.2'
 
 apply from: project(":CodeAPI").file("gradle/common.gradle")
 
 dependencies {
     compile project(":CodeAPI")
     compile 'com.github.JonathanxD:BytecodeDisassembler:2.0.3-d'
-    compile group: 'org.ow2.asm', name: 'asm-all', version: '5.1'
+    compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
     testCompile project(path: ':CodeAPI', configuration: 'tests')
 }
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/exception/ClassCheckException.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/exception/ClassCheckException.kt
@@ -0,0 +1,5 @@
+package com.github.jonathanxd.codeapi.bytecode.exception
+
+import com.github.jonathanxd.codeapi.bytecode.BytecodeClass
+
+class ClassCheckException(message: String, cause: Throwable, val bytecodeClasses: Array<out BytecodeClass>, val failedBytecodeClass: BytecodeClass) : RuntimeException(message, cause)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/extra/Dup.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/extra/Dup.kt
@@ -0,0 +1,35 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <jonathan.scripter@programmer.net>
+ *      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.github.jonathanxd.codeapi.bytecode.extra
+
+import com.github.jonathanxd.codeapi.base.Typed
+
+/**
+ * CodeAPI-BytecodeWriter Dup part. This part will dup result of [part].
+ */
+data class Dup(val part: Typed) : Typed by part
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/extra/Pop.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/extra/Pop.kt
@@ -0,0 +1,37 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <jonathan.scripter@programmer.net>
+ *      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.github.jonathanxd.codeapi.bytecode.extra
+
+import com.github.jonathanxd.codeapi.CodePart
+
+/**
+ * CodeAPI-BytecodeWriter Pop part. This part will pop the stack value.
+ *
+ * This class is commonly used in else statements to clear value created by [Dup] instruction. See the 'DupTest' test class.
+ */
+object Pop : CodePart
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/BytecodeGenerator.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/BytecodeGenerator.kt
@@ -36,6 +36,9 @@ import com.github.jonathanxd.codeapi.bytecode.CHECK
 import com.github.jonathanxd.codeapi.bytecode.VISIT_LINES
 import com.github.jonathanxd.codeapi.bytecode.VisitLineType
 import com.github.jonathanxd.codeapi.bytecode.common.MVData
+import com.github.jonathanxd.codeapi.bytecode.exception.ClassCheckException
+import com.github.jonathanxd.codeapi.bytecode.extra.Dup
+import com.github.jonathanxd.codeapi.bytecode.extra.Pop
 import com.github.jonathanxd.codeapi.bytecode.gen.visitor.*
 import com.github.jonathanxd.codeapi.common.Data
 import com.github.jonathanxd.codeapi.exception.ProcessingException
@@ -102,6 +105,9 @@ class BytecodeGenerator @JvmOverloads constructor(val sourceFile: (TypeDeclarati
         addUncheckedVisitor(ClassDeclaration::class.java, TypeVisitor)
         addUncheckedVisitor(InterfaceDeclaration::class.java, TypeVisitor)
 
+        // Extra
+        addVisitor(Dup::class.java, DupVisitor)
+        addVisitor(Pop::class.java, PopVisitor)
     }
 
     override val options: Options = this.options_
@@ -140,10 +146,13 @@ class BytecodeGenerator @JvmOverloads constructor(val sourceFile: (TypeDeclarati
             additional.methodVisitor.visitLineNumber(line, lbl)
 
         }
-
-        return super.generateTo(partClass, codePart, extraData, consumer, additional).let {
-            check(it)
-            it
+        try {
+            return super.generateTo(partClass, codePart, extraData, consumer, additional).let {
+                check(it)
+                it
+            }
+        }catch (e: Throwable) {
+            throw if(e is ProcessingException) throw e.cause?.let { it as? ClassCheckException ?: e } ?: e else e
         }
     }
 
@@ -156,7 +165,7 @@ class BytecodeGenerator @JvmOverloads constructor(val sourceFile: (TypeDeclarati
                         try {
                             ClassReader(bytecode).accept(CheckClassAdapter(ClassNode(), true), 0)
                         } catch (t: Throwable) {
-                            throw ProcessingException("Failed to check bytecode of class ${it.type.qualifiedName}", t)
+                            throw ClassCheckException("Failed to check bytecode of class ${it.type.qualifiedName}", t, classes, it)
                         }
                     }
                 }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/DupVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/DupVisitor.kt
@@ -0,0 +1,46 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <jonathan.scripter@programmer.net>
+ *      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.github.jonathanxd.codeapi.bytecode.gen.visitor
+
+import com.github.jonathanxd.codeapi.bytecode.BytecodeClass
+import com.github.jonathanxd.codeapi.bytecode.common.MVData
+import com.github.jonathanxd.codeapi.bytecode.extra.Dup
+import com.github.jonathanxd.codeapi.common.Data
+import com.github.jonathanxd.codeapi.gen.visit.VisitorGenerator
+import com.github.jonathanxd.codeapi.gen.visit.VoidVisitor
+import org.objectweb.asm.Opcodes
+
+object DupVisitor : VoidVisitor<Dup, BytecodeClass, MVData> {
+
+    override fun voidVisit(t: Dup, extraData: Data, visitorGenerator: VisitorGenerator<BytecodeClass>, additional: MVData) {
+        val part = t.part
+        visitorGenerator.generateTo(part::class.java, part, extraData, additional)
+        additional.methodVisitor.visitInsn(Opcodes.DUP)
+    }
+
+}
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/PopVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/PopVisitor.kt
@@ -0,0 +1,44 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <jonathan.scripter@programmer.net>
+ *      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.github.jonathanxd.codeapi.bytecode.gen.visitor
+
+import com.github.jonathanxd.codeapi.bytecode.BytecodeClass
+import com.github.jonathanxd.codeapi.bytecode.common.MVData
+import com.github.jonathanxd.codeapi.bytecode.extra.Pop
+import com.github.jonathanxd.codeapi.common.Data
+import com.github.jonathanxd.codeapi.gen.visit.VisitorGenerator
+import com.github.jonathanxd.codeapi.gen.visit.VoidVisitor
+import org.objectweb.asm.Opcodes
+
+object PopVisitor : VoidVisitor<Pop, BytecodeClass, MVData> {
+
+    override fun voidVisit(t: Pop, extraData: Data, visitorGenerator: VisitorGenerator<BytecodeClass>, additional: MVData) {
+        additional.methodVisitor.visitInsn(Opcodes.POP)
+    }
+
+}
diff --git a/src/test/java/com/github/jonathanxd/codeapi/test/asm/CommonBytecodeTest.java b/src/test/java/com/github/jonathanxd/codeapi/test/asm/CommonBytecodeTest.java
@@ -33,6 +33,7 @@
 import com.github.jonathanxd.codeapi.bytecode.BytecodeClass;
 import com.github.jonathanxd.codeapi.bytecode.BytecodeOptions;
 import com.github.jonathanxd.codeapi.bytecode.VisitLineType;
+import com.github.jonathanxd.codeapi.bytecode.exception.ClassCheckException;
 import com.github.jonathanxd.codeapi.bytecode.gen.BytecodeGenerator;
 import com.github.jonathanxd.iutils.annotation.Named;
 import com.github.jonathanxd.iutils.exception.RethrowException;
@@ -66,7 +67,13 @@ public class CommonBytecodeTest {
 
         BCLoader bcLoader = new BCLoader();
 
-        BytecodeClass[] bytecodeClasses = bytecodeGenerator.gen(source);
+        BytecodeClass[] bytecodeClasses;
+
+        try {
+            bytecodeClasses = bytecodeGenerator.gen(source);
+        } catch (ClassCheckException e) {
+            bytecodeClasses = e.getBytecodeClasses();
+        }
 
         Class<?> first = null;
 
diff --git a/src/test/java/com/github/jonathanxd/codeapi/test/asm/DupTest.java b/src/test/java/com/github/jonathanxd/codeapi/test/asm/DupTest.java
@@ -0,0 +1,92 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <jonathan.scripter@programmer.net>
+ *      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.github.jonathanxd.codeapi.test.asm;
+
+import com.github.jonathanxd.codeapi.CodeAPI;
+import com.github.jonathanxd.codeapi.Types;
+import com.github.jonathanxd.codeapi.base.TypeDeclaration;
+import com.github.jonathanxd.codeapi.builder.ClassDeclarationBuilder;
+import com.github.jonathanxd.codeapi.builder.ConstructorDeclarationBuilder;
+import com.github.jonathanxd.codeapi.builder.IfStatementBuilder;
+import com.github.jonathanxd.codeapi.bytecode.extra.Dup;
+import com.github.jonathanxd.codeapi.bytecode.extra.Pop;
+import com.github.jonathanxd.codeapi.common.CodeModifier;
+import com.github.jonathanxd.codeapi.common.TypeSpec;
+import com.github.jonathanxd.codeapi.helper.Predefined;
+import com.github.jonathanxd.codeapi.literal.Literals;
+import com.github.jonathanxd.codeapi.util.Stack;
+
+import org.junit.Test;
+
+import java.util.Collections;
+
+public class DupTest {
+
+    public static String getNull() {
+        return null;
+    }
+
+    public static String getNotNull() {
+        return "Aa";
+    }
+
+    @Test
+    public void dupTest() {
+        TypeDeclaration getNull = gen("getNull");
+
+        CommonBytecodeTest.test(this.getClass(), getNull, CodeAPI.source(getNull));
+
+        TypeDeclaration getNotNull = gen("getNotNull");
+
+        CommonBytecodeTest.test(this.getClass(), getNotNull, CodeAPI.source(getNotNull));
+    }
+
+    private TypeDeclaration gen(String methodName) {
+        return ClassDeclarationBuilder.builder()
+                .withModifiers(CodeModifier.PUBLIC)
+                .withQualifiedName("test.DupTest_" + methodName)
+                .withSuperClass(Types.OBJECT)
+                .withBody(CodeAPI.source(
+                        ConstructorDeclarationBuilder.builder()
+                                .withModifiers(CodeModifier.PUBLIC)
+                                .withBody(
+                                        CodeAPI.source(Predefined.invokePrintlnStr(
+                                                IfStatementBuilder.builder()
+                                                        .withExpressions(CodeAPI.checkNotNull(
+                                                                new Dup(CodeAPI.invokeStatic(DupTest.class, methodName, new TypeSpec(Types.STRING), Collections.emptyList()))
+                                                        ))
+                                                        .withBody(CodeAPI.source(Stack.INSTANCE))
+                                                        .withElseStatement(CodeAPI.source(Pop.INSTANCE, Literals.STRING("NULL")))
+                                                        .build()
+                                        ))
+                                )
+                                .build()
+                ))
+                .build();
+    }
+}
diff --git a/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled b/src/test/resources/disassembled/DupTest_DupTest_getNotNull_Result.class.disassembled
diff --git a/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled b/src/test/resources/disassembled/DupTest_DupTest_getNull_Result.class.disassembled

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ buildscript {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`group 'com.github.jonathanxd'`
`21`		`-version '3.1.1'`
	`21`	`+version '3.1.0-3.1.2'`
`22`	`22`
`23`	`23`	`apply from: project(":CodeAPI").file("gradle/common.gradle")`
`24`	`24`
`25`	`25`	`dependencies {`
`26`	`26`	`compile project(":CodeAPI")`
`27`	`27`	`compile 'com.github.JonathanxD:BytecodeDisassembler:2.0.3-d'`
`28`		`- compile group: 'org.ow2.asm', name: 'asm-all', version: '5.1'`
	`28`	`+ compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'`
`29`	`29`	`testCompile project(path: ':CodeAPI', configuration: 'tests')`
`30`	`30`	`}`
`31`	`31`