X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;fp=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=3d77ba3e08013625bff12759a544aadd801181cf;hp=28c30dd85e9fb7f11df35cabb627ca6d488fd356;hb=58b777d0f15df1ffd1bfa16135030118ba7c26e3;hpb=1dc8d09e9f6b1a05ccd0a190ab63359ce90e363d

diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 28c30dd..3d77ba3 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -18,6 +18,7 @@ public abstract class Type implements CGConst {
     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 NULL = new Null();
     
     public static final Type.Class OBJECT = Type.Class.instance("java.lang.Object");
     public static final Type.Class STRING = Type.Class.instance("java.lang.String");
@@ -53,6 +54,15 @@ public abstract class Type implements CGConst {
     public boolean     isClass()     { return false; }
     public boolean     isArray()     { return false; }
 
+    public static Type unify(Type t1, Type t2) {
+        if(t1 == Type.NULL) return t2;
+        if(t2 == Type.NULL) return t1;
+        if(t1 == t2) return t1;
+        // FIXME: This needs to do a lot more (subclasses, etc)
+        // it probably should be in Context.java
+        return null;
+    }
+    
     // Protected/Private //////////////////////////////////////////////////////////////////////////////
 
     protected final String descriptor;
@@ -61,6 +71,10 @@ public abstract class Type implements CGConst {
         this.descriptor = descriptor;
         instances.put(descriptor, this);
     }
+    
+    public static class Null extends Type {
+        protected Null() { super(""); } // not really correct....
+    }
 
     public static class Primitive extends Type {
         private String humanReadable;