resolve compile errors

[org.ibex.classgen.git] / src / org / ibex / classgen / Type.java

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index cf9e4a7..d61df3e 100644 (file)
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -10,14 +10,14 @@ public abstract class Type implements CGConst {
     // Public API //////////////////////////////////////////////////////////////////////////////
 
     public static final Type VOID = new Primitive("V", "void");
-    public static final Type INT = new Primitive("I", "int");
-    public static final Type LONG = new Primitive("J", "long");
-    public static final Type BOOLEAN = new Primitive("Z", "boolean");
-    public static final Type DOUBLE = new Primitive("D", "double");
-    public static final Type FLOAT = new Primitive("F", "float");
-    public static final Type BYTE = new Primitive("B", "byte");
-    public static final Type CHAR = new Primitive("C", "char");
-    public static final Type SHORT = new Primitive("S", "short");
+    public static final Type INT = new Primitive("I", "int", 10);
+    public static final Type LONG = new Primitive("J", "long", 11);
+    public static final Type BOOLEAN = new Primitive("Z", "boolean", 4);
+    public static final Type DOUBLE = new Primitive("D", "double", 7);
+    public static final Type FLOAT = new Primitive("F", "float", 6);
+    public static final Type BYTE = new Primitive("B", "byte", 8);
+    public static final Type CHAR = new Primitive("C", "char", 5);
+    public static final Type SHORT = new Primitive("S", "short", 9);
     public static final Type NULL = new Null();
     
     public static final Type.Class OBJECT = Type.Class.instance("java.lang.Object");
@@ -63,6 +63,20 @@ public abstract class Type implements CGConst {
         // it probably should be in Context.java
         return null;
     }
+
+    public static Type fromArraySpec(int i) {
+        switch(i) {
+            case 4: return Type.BOOLEAN;
+            case 5: return Type.CHAR;
+            case 6: return Type.FLOAT;
+            case 7: return Type.DOUBLE;
+            case 8: return Type.BYTE;
+            case 9: return Type.SHORT;
+            case 10: return Type.INT;
+            case 11: return Type.LONG;
+            default: throw new IllegalStateException("invalid array type");
+        }
+    }
     
     // Protected/Private //////////////////////////////////////////////////////////////////////////////
 
@@ -79,12 +93,19 @@ public abstract class Type implements CGConst {
 
     public static class Primitive extends Type {
         private String humanReadable;
-        Primitive(String descriptor, String humanReadable) {
+        private int arraySpec;
+        Primitive(String descriptor, String humanReadable) { this(descriptor, humanReadable, -1); }
+        Primitive(String descriptor, String humanReadable, int arraySpec) {
             super(descriptor);
             this.humanReadable = humanReadable;
+            this.arraySpec = arraySpec;
         }
         public String toString() { return humanReadable; }
         public boolean     isPrimitive() { return true; }
+        public int toArraySpec() {
+            if (arraySpec < 0) throw new Error("you can't make arrays of " + this);
+            return arraySpec;
+        }
     }
     
     public abstract static class Ref extends Type {
@@ -92,6 +113,7 @@ public abstract class Type implements CGConst {
         public abstract String toString();
         public    Type.Ref asRef() { return this; }
         public    boolean  isRef() { return true; }
+        abstract String internalForm();
     }
 
     public static class Array extends Type.Ref {
@@ -101,6 +123,7 @@ public abstract class Type implements CGConst {
         public boolean isArray() { return true; }
         public String toString() { return base.toString() + "[]"; }
         public Type getElementType() { return base; }
+        String internalForm() { return getDescriptor(); }
     }
 
     public static class Class extends Type.Ref {