Updated ConstantPool Parser

Author: NatureFreshMeat

src/main/java/ch/ri/jsjvm/utils/ClassToJson.java

@@ -10,9 +10,20 @@
 publicclassClassToJson
 {
 
+/**
+ * List of classes to convert
+ */
+privatestaticfinalClass<?>[] classList =
+{
+TestClass.class,
+Object.class,
+String.class
+ };
+
 publicstaticvoidmain(String[] args) throwsException
 {
-convert( TestClass.class.getName() );
+for (Class<?> c: classList)
+convert( c.getName() );
  }
 
 privatestaticfinalStringoutputDir = "test/classes/";
@@ -32,7 +43,6 @@ private static void convert(String className) throws IOException
 ByteArrayOutputStreamoutput = newByteArrayOutputStream(4096);
 
 byte[] buffer = newbyte[4096];
-intoffset = 0;
 
 while(true)
 {
@@ -41,8 +51,7 @@ private static void convert(String className) throws IOException
 if (count <= 0)
 break;
 
-output.write(buffer, offset, count);
-offset += count;
+output.write(buffer, 0, count);
  }
 
 byte[] bytes = output.toByteArray();

src/main/javascript/10_ConstantPoolParser.js

@@ -16,11 +16,11 @@ var ConstantPoolParser = function(classReader)
  */
 this.constants=newArray();
 
-this.classReferences=newArray();
-varunresolvedClassReferences=newArray();
+this.classes=newArray();
+varunresolvedclasses=newArray();
 
-this.methodReferences=newArray();
-varunresolvedMethodReferences=newArray();
+this.methods=newArray();
+varunresolvedmethods=newArray();
 
 while(this.constants.length<constant_pool_size-1)
 {
@@ -92,7 +92,7 @@ var ConstantPoolParser = function(classReader)
  */
 varref=classReader.getU2(pos);
 Logger.debug("Class reference: "+ref);
-unresolvedClassReferences.push(constantNum);
+unresolvedclasses.push(constantNum);
 this.constants.push(ref);
 pos+=2;
 }
@@ -125,7 +125,7 @@ var ConstantPoolParser = function(classReader)
 entry.classRef=classRef;
 entry.descriptor=descriptor;
 
-unresolvedMethodReferences.push(constantNum);
+unresolvedmethods.push(constantNum);
 this.constants.push(entry);
 pos+=2;
 }
@@ -153,29 +153,29 @@ var ConstantPoolParser = function(classReader)
 /**
  * Resolve class references
  */
-for(vari=0;i<unresolvedClassReferences.length;i++)
+for(vari=0;i<unresolvedclasses.length;i++)
 {
-varconstantRef=unresolvedClassReferences[i];
+varconstantRef=unresolvedclasses[i];
 varref=this.constants[constantRef]
 varresolved=this.constants[ref-1];
 
-this.classReferences[constantRef]=resolved;
+this.classes[constantRef]=resolved;
 
 Logger.debug("Resolved class ref: "+constantRef+" = "+resolved);
 }
 
 /**
  * Resolve method references
  */
-for(vari=0;i<unresolvedMethodReferences.length;i++)
+for(vari=0;i<unresolvedmethods.length;i++)
 {
-varconstantRef=unresolvedMethodReferences[i];
+varconstantRef=unresolvedmethods[i];
 varentry=this.constants[constantRef];
 
 entry.classRef=this.constants[entry.classRef];
 entry.descriptor=this.constants[entry.descriptor];
 
-this.methodReferences[constantRef]=entry;
+this.methods[constantRef]=entry;
 
 Logger.debug("Resolved method ref: "+constantRef+" = "+entry.classRef+" - "+entry.descriptor);
 }