[Nice-commit] Nice/src/bossa/parser Parser.jj,1.205,1.206

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

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

Modified Files:
	Parser.jj 
Log Message:
Store the location of every null literal and removed deprecated syntax.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -d -r1.205 -r1.206
*** Parser.jj	28 Aug 2003 17:46:14 -0000	1.205
--- Parser.jj	2 Sep 2003 19:57:51 -0000	1.206
***************
*** 1161,1172 ****
      (
        "@"
!       (
!         val=patternLiteral() 
! 	{ User.warning(name, 
!           "This syntax is deprecated.\n" + "Leave '"+ name+"@' away.");}
!       |
!         tc=typeIdent()
!         [ ":" runtimeTC = typeConstructor() ]
!       )
      |
        "#" tc=typeIdent() { exactlyAt = true; }
--- 1161,1166 ----
      (
        "@"
!       tc=typeIdent()
!       [ ":" runtimeTC = typeConstructor() ]
      |
        "#" tc=typeIdent() { exactlyAt = true; }
***************
*** 1240,1255 ****
  {
      [ "<" binders=strings() ">" ]
- 
      name=identOrBackquoted()
- 
-     // Deprecated.
-     [ { Token t; } 
-       t="<" binders=strings() ">" 
-       { User.warning(Location.make(t), 
-                      "This syntax is deprecated.\n" + 
- "Type parameters should now be placed in front of the method implementation.");
-       }
-     ]
- 
      "("
      [ p=pattern() { parameters.add(p); }
--- 1234,1238 ----
***************
*** 1468,1471 ****
--- 1451,1461 ----
  /***********************************************************************/
  
+ ConstantExp nullConstantExp():
+ { Token t; }
+ {
+   t="null" 
+   { return NullExp.create(Location.make(t)); }
+ }
+ 
  ConstantExp booleanConstantExp():
  { Token t; }
***************
*** 2076,2080 ****
  }
  {
! ( "null" { res = NullExp.instance; }
  | res=booleanConstantExp()
  | res=intConstantExp() 
--- 2066,2070 ----
  }
  {
! ( res=nullConstantExp()
  | res=booleanConstantExp()
  | res=intConstantExp() 
***************
*** 2093,2097 ****
  }
  {
! ( "null" { res = NullExp.instance; }
  | res=negativeIntConstantExp()
  | res=intConstantExp() 
--- 2083,2087 ----
  }
  {
! ( res=nullConstantExp()
  | res=negativeIntConstantExp()
  | res=intConstantExp()