[Nice-commit] Nice/src/bossa/syntax NullExp.java,1.8,1.9 Pattern.java,1.69,1.70

[<ar...@us...>]

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

Modified Files:
	NullExp.java Pattern.java 
Log Message:
Store the location of every null literal and removed deprecated syntax.

Index: NullExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NullExp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NullExp.java	22 Jul 2003 12:09:05 -0000	1.8
--- NullExp.java	2 Sep 2003 19:57:52 -0000	1.9
***************
*** 32,38 ****
        since it has no state.
    */
!   public static final NullExp instance = new NullExp();
    
    private NullExp() {}
  
    void computeType()
--- 32,45 ----
        since it has no state.
    */
! //  public static final NullExp instance = new NullExp();
    
    private NullExp() {}
+ 
+   public static NullExp create(Location loc)
+   {
+     NullExp res = new NullExp();
+     res.setLocation(loc);
+     return res;
+   }
  
    void computeType()

Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** Pattern.java	14 Aug 2003 09:34:47 -0000	1.69
--- Pattern.java	2 Sep 2003 19:57:52 -0000	1.70
***************
*** 727,731 ****
  
      if (name.equals("NULL"))
!       return new Pattern(NullExp.instance);
  
      if (name.equals("true") || name.equals("false") ) 
--- 727,731 ----
  
      if (name.equals("NULL"))
!       return new Pattern(NullExp.create(Location.nowhere()));
  
      if (name.equals("true") || name.equals("false") ) 
***************
*** 824,828 ****
      return atValue != null && !atBool() && !atNull() &&!atIntCompare();
    }
!   public boolean atNull() { return atValue == NullExp.instance; }
    public boolean atAny()  { return atValue == null && tc == null; }
    public boolean atBool() { 
--- 824,828 ----
      return atValue != null && !atBool() && !atNull() &&!atIntCompare();
    }
!   public boolean atNull() { return atValue instanceof NullExp; }
    public boolean atAny()  { return atValue == null && tc == null; }
    public boolean atBool() {