Sync with final ch21

Author: dibyendumajumdar

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/nodes/CallEndNode.java

@@ -59,7 +59,7 @@ public Node idealize() {
 
         // Trivial inlining: call site calls a single function; single function
         // is only called by this call site.
-        if( !_folding && nIns()==2 && in(0) instanceof CallNode call ) {
+        if( false && !_folding && nIns()==2 && in(0) instanceof CallNode call ) {
             Node fptr = call.fptr();
             if( fptr.nOuts() == 1 && // Only user is this call
                 fptr instanceof ConstantNode && // We have an immediate call

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/nodes/CallNode.java

@@ -138,7 +138,7 @@ public void unlink_all() {
                 assert linked(fun);
                 int idx = fun._inputs.find(this);
                 for( Node use : fun._outputs )
-                    if( use instanceof ParmNode parm )
+                    if( use instanceof ParmNode )
                         use.delDef(idx);
                 fun.delDef(idx);
                 cend().delDef(cend()._inputs.find(fun.ret()));

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/nodes/FunNode.java

@@ -88,6 +88,7 @@ public Node idealize() {
 
         // Upgrade inferred or user-written return type to actual
         if( _ret!=null && _ret._type instanceof SONTypeTuple tt && tt.ret() != _sig.ret() )
+		    // FIXME Dibyendu
             //throw Utils.TODO();
             return null;
 

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/nodes/ReturnNode.java

@@ -61,7 +61,9 @@ public SONType compute() {
         if( inProgress () ) return null;
         if( _fun.isDead() ) return null;
 
-//        // Upgrade signature based on return type
+          // Upgrade signature based on return type
+          // FIXME Dibyendu - EZ lang does not support modifying function signature
+          // but we should probably do the checking?
 //        SONType ret = expr()._type;
 //        SONTypeFunPtr fcn = _fun.sig();
 //        assert ret.isa(fcn.ret());

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/sontypes/SONTypeMemPtr.java

@@ -43,9 +43,9 @@ public SONTypeMemPtr(byte nil, SONTypeStruct obj) {
 
     // An abstract pointer, pointing to either a Struct or an Array.
     // Can also be null or not, so 4 choices {TOP,BOT} x {nil,not}
-    public static SONTypeMemPtr BOT = make((byte)3, SONTypeStruct.BOT);
-    public static SONTypeMemPtr TOP = BOT.dual();
-    public static SONTypeMemPtr NOTBOT = make((byte)2, SONTypeStruct.BOT);
+    public static final SONTypeMemPtr BOT = make((byte)3, SONTypeStruct.BOT);
+    public static final SONTypeMemPtr TOP = BOT.dual();
+    public static final SONTypeMemPtr NOTBOT = make((byte)2, SONTypeStruct.BOT);
 
     //public static SONTypeMemPtr TEST= make((byte)2, SONTypeStruct.TEST);
     public static void gather(ArrayList<SONType> ts) { ts.add(NOTBOT); ts.add(BOT); /* ts.add(TEST); */ }
@@ -79,7 +79,7 @@ public SONTypeNil xmeet(SONType t) {
     // Is forward-reference
     @Override public boolean isFRef() { return _obj.isFRef(); }
 
-    @Override public int log_size() { return 2; } // (1<<2)==4-byte pointers
+    @Override public int log_size() { return 3; } // (1<<3)==8-byte pointers
 
     @Override int hash() { return _obj.hashCode() ^ super.hash(); }
 

seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler/sontypes/SONTypeStruct.java

@@ -192,9 +192,12 @@ int hash() {
 
     @Override
     public SB print(SB sb) {
+        if( _fields == null ) return sb.p(_name); // Forward reference struct, just print the name
+        if( isAry() ) {
+            if( !isFinal() ) sb.p("!");
+            return sb.p(_name); // Skip printing generic array fields
+        }
         sb.p(_name);
-        if( _fields == null ) return sb; // Forward reference struct, just print the name
-        if( isAry() ) return sb; // Skip printing generic array fields
         sb.p(" {");
         for( Field f : _fields )
             f._type.print(sb).p(f._final ? " " : " !").p(f._fname).p("; ");