[Nice-commit] Nice/src/bossa/syntax VoidConstantExp.java,1.5,1.6 IfExp.java,1.14,1.15 ExpressionStmt.java,1.15,1.16 Block.java,1.61,1.62

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv27407/src/bossa/syntax

Modified Files:
	VoidConstantExp.java IfExp.java ExpressionStmt.java Block.java 
Log Message:
Print more constructs as valid syntax.


Index: VoidConstantExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/VoidConstantExp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VoidConstantExp.java	12 May 2001 22:16:28 -0000	1.5
--- VoidConstantExp.java	11 Sep 2003 15:44:20 -0000	1.6
***************
*** 34,38 ****
    public String toString()
    {
!     return "()";
    }
  }
--- 34,38 ----
    public String toString()
    {
!     return "{}";
    }
  }

Index: IfExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/IfExp.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IfExp.java	29 Mar 2003 00:30:28 -0000	1.14
--- IfExp.java	11 Sep 2003 15:44:20 -0000	1.15
***************
*** 89,93 ****
        "\nelse\n" +
        String.valueOf(elseExp) +
!       "\nendif"
        ;
    }
--- 89,93 ----
        "\nelse\n" +
        String.valueOf(elseExp) +
!       "\n"
        ;
    }

Index: ExpressionStmt.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/ExpressionStmt.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ExpressionStmt.java	20 Jan 2003 19:20:59 -0000	1.15
--- ExpressionStmt.java	11 Sep 2003 15:44:20 -0000	1.16
***************
*** 44,48 ****
    public String toString()
    {
!     return exp.toString();
    }
  
--- 44,48 ----
    public String toString()
    {
!     return exp.toString() + ";";
    }
  

Index: Block.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Block.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Block.java	19 Jul 2003 00:54:05 -0000	1.61
--- Block.java	11 Sep 2003 15:44:20 -0000	1.62
***************
*** 81,84 ****
--- 81,92 ----
        return null;
      }
+ 
+     public String display()
+     {
+       if (value == null)
+         return getSymbol().toString();
+       else
+         return getSymbol().toString() + '=' + value;        
+     }
    }
  
***************
*** 99,102 ****
--- 107,125 ----
  
      LocalValue next, last;
+ 
+     public String toString()
+     {
+       StringBuffer res = new StringBuffer();
+       LocalValue v = this;
+       while (true) {
+         res.append(v.display());
+         v = v.next;
+         if (v == null)
+           break;
+         else
+           res.append(',');
+       }
+       return res.toString();
+     }
    }
  
***************
*** 170,173 ****
--- 193,201 ----
        last = last.next;
      }
+ 
+     public String display()
+     {
+       return "var " + super.display();
+     }
    }
  
***************
*** 205,208 ****
--- 233,241 ----
        last = last.next;
      }
+ 
+     public String toString()
+     {
+       return "let " + super.display();
+     }
    }
  
***************
*** 377,380 ****
--- 410,414 ----
    {
      return "{\n"
+       + Util.map("",";\n",";\n",locals)
        + Util.map("",";\n",";\n",statements)
        + "}\n";