Support local classes fixes #8.

Author: JonathanxD

CodeAPI

@@ -18,13 +18,13 @@ buildscript {
 }
 
 group 'com.github.jonathanxd'
-version '3.0.3-hotfix4'
+version '3.1.0'
 
 apply from: project(":CodeAPI").file("gradle/common.gradle")
 
 dependencies {
     compile project(":CodeAPI")
-    compile 'com.github.JonathanxD:BytecodeDisassembler:2.0.3-c2'
+    compile 'com.github.JonathanxD:BytecodeDisassembler:2.0.3-d'
     compile group: 'org.ow2.asm', name: 'asm-all', version: '5.1'
     testCompile project(path: ':CodeAPI', configuration: 'tests')
 }

build.gradle

@@ -69,8 +69,29 @@ object TypeVisitor : Visitor<TypeDeclaration, BytecodeClass, Any?> {
 
     override fun visit(t: TypeDeclaration, extraData: Data, visitorGenerator: VisitorGenerator<BytecodeClass>, additional: Any?): Array<BytecodeClass> {
 
+        /*val extraData = if(additional == null)
+            data
+        else
+            data.clone()*/
+
         val baseDataClone = extraData.clone()
 
+        /*if(additional != null) {
+            val outer = data.getRequired<TypeDeclaration>(TYPE_DECLARATION_REPRESENTATION)
+            val cw = data.getRequired<ClassVisitor>(CLASS_VISITOR_REPRESENTATION)
+
+            if(!outer.`is`(t.outerClass))
+                throw IllegalArgumentException("Outer class specified to '" + t + "' don't matches the real outer class. " +
+                        "Specified: '" + t.outerClass + "'," +
+                        "Real: '" + outer + "'!")
+
+            val inn = Util.visitInner(cw, outer, listOf(t))
+
+
+
+            data.registerData(INNER_TYPE_REPRESENTATION, )
+        }*/
+
         val cw = ClassWriter(ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES)
 
 

src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/TypeVisitor.kt

@@ -107,6 +107,15 @@ object Util {
             } else {
                 if (part is TypeDeclaration) {
                     typeDeclarationList.add(part)
+                } else if (part is MethodDeclaration) {
+                    val grabRemovePair = Util.grabAndRemoveInnerDecl(part.body)
+
+                    typeDeclarationList.addAll(grabRemovePair.first)
+
+                    val modifiedMethod = part.builder().withBody(grabRemovePair.second).build()
+
+                    codeSource.add(modifiedMethod)
+
                 } else {
                     codeSource.add(part)
                 }

src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/Util.kt

@@ -0,0 +1,53 @@
+/*
+ *      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/) <[email protected]>
+ *      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.CodeSource;
+import com.github.jonathanxd.codeapi.base.TypeDeclaration;
+import com.github.jonathanxd.codeapi.test.CommonGen;
+import com.github.jonathanxd.codeapi.test.LocalClassTest_;
+import com.github.jonathanxd.iutils.annotation.Named;
+import com.github.jonathanxd.iutils.object.Pair;
+
+import org.junit.Test;
+
+public class LocalClassTest {
+    @Test
+    public void localTest() {
+        Pair<@Named("Main class") TypeDeclaration, @Named("Source") CodeSource> $ = LocalClassTest_.$();
+
+        Class<?> define = CommonBytecodeTest.test(this.getClass(), $._1(), $._2(), aClass -> aClass);
+
+        try {
+            define.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}

src/test/java/com/github/jonathanxd/codeapi/test/asm/LocalClassTest.java

@@ -0,0 +1,60 @@
+md5: 45db4018fea4313629a30a39a3762409
+
+version: Java 8 (52)
+access: PACKAGE_PRIVATE (32)
+
+source: LocalClass.cai
+
+ class test.LocalClass$Greeter extends java.lang.Object {
+
+    !access: PACKAGE_PRIVATE (0)
+     test.LocalClass.Greeter -> test.LocalClass$Greeter
+
+    !access: ACC_PRIVATE, ACC_FINAL (18)
+    private final test.LocalClass localClass$outer1
+
+    !access: ACC_PUBLIC (1)
+    public void greet() {
+      desc: ()V 
+      maxStack: 2, maxLocals: 1 
+      Label_0:
+       LINE 5 -> Label_0
+        getstatic java.lang.System.out (type: java.io.PrintStream)
+        ldc "Hello"              // type: java.lang.String
+        invokevirtual java.io.PrintStream.println(java.lang.String)void (ownerIsInterface: false)
+        return
+      Label_1:
+      LocalVariables {
+        index: 0, name: this, start: Label_0, end: Label_1, type: test.LocalClass$Greeter, signature: null
+      }
+    }
+    
+    !access: ACC_PUBLIC (1)
+    public void <init>(test.LocalClass) {
+      desc: (Ltest/LocalClass;)V 
+      maxStack: 2, maxLocals: 2 
+      Label_0:
+        aload 0
+        invokespecial java.lang.Object.<init>()void (ownerIsInterface: false)
+      Label_1:
+       LINE 6 -> Label_1
+       LINE 7 -> Label_1
+        aload 0
+        aload 1
+        putfield test.LocalClass$Greeter.localClass$outer1 (type: test.LocalClass)
+        return
+      Label_2:
+      LocalVariables {
+        index: 1, name: localClass$outer1, start: Label_0, end: Label_2, type: test.LocalClass, signature: null
+        index: 0, name: this, start: Label_0, end: Label_2, type: test.LocalClass$Greeter, signature: null
+      }
+    }
+    
+    !access: PACKAGE_PRIVATE, ACC_STATIC (8)
+    static void <clinit>() {
+      desc: ()V 
+      maxStack: 0, maxLocals: 0 
+        return
+    }
+    
+}

src/test/resources/disassembled/LocalClassTest_Greeter_Result.class.disassembled

@@ -0,0 +1,41 @@
+md5: 66df9ef26ab3e5f26bb2690aa7f1e097
+
+version: Java 8 (52)
+access: ACC_PUBLIC (33)
+
+source: LocalClass.cai
+
+public class test.LocalClass extends java.lang.Object {
+
+    !access: PACKAGE_PRIVATE (0)
+     test.LocalClass.Greeter -> test.LocalClass$Greeter
+
+    !access: ACC_PUBLIC (1)
+    public void <init>() {
+      desc: ()V 
+      maxStack: 3, maxLocals: 1 
+      Label_0:
+        aload 0
+        invokespecial java.lang.Object.<init>()void (ownerIsInterface: false)
+      Label_1:
+       LINE 3 -> Label_1
+        new test.LocalClass$Greeter
+        dup
+        aload 0
+        invokespecial test.LocalClass$Greeter.<init>(test.LocalClass)void (ownerIsInterface: false)
+        invokevirtual test.LocalClass$Greeter.greet()void (ownerIsInterface: false)
+        return
+      Label_2:
+      LocalVariables {
+        index: 0, name: this, start: Label_0, end: Label_2, type: test.LocalClass, signature: null
+      }
+    }
+    
+    !access: PACKAGE_PRIVATE, ACC_STATIC (8)
+    static void <clinit>() {
+      desc: ()V 
+      maxStack: 0, maxLocals: 0 
+        return
+    }
+    
+}