public static Type unify(Type t1, Type t2) {
if(t1 == Type.NULL) return t2;
if(t2 == Type.NULL) return t1;
+ if((t1 == Type.INT && t2 == Type.BOOLEAN) || (t2 == Type.INT & t1 == Type.BOOLEAN)) return Type.BOOLEAN;
if(t1 == t2) return t1;
// FIXME: This needs to do a lot more (subclasses, etc)
// it probably should be in Context.java
if (name.equals("<init>"))
sb.append(Class.this.getShortName());
else
- sb.append(returnType.toString()).append(".").append(name);
+ sb.append(returnType.toString()).append(" ").append(name);
sb.append("(");
for(int i=0; i<argTypes.length; i++)
sb.append((i==0?"":", ")+argTypes[i].toString());