[Nice-commit] Nice/src/bossa/parser Parser.jj,1.156,1.157

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

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

Modified Files:
	Parser.jj 
Log Message:
Parameter type naming is now done on the tag only, as this is the only 
interesting part.
Therefore, the part after : is always a type constructor variable, so we
don't need to declare anything before; it is declared there. So we remove
the syntax to declare additional type parameters in front of the method
implementation.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** Parser.jj	25 Apr 2003 17:21:36 -0000	1.156
--- Parser.jj	28 Apr 2003 18:10:32 -0000	1.157
***************
*** 1187,1191 ****
    Token t;
    TypeIdent tc=null, additional = null;
!   Monotype type=null;
    Expression val = null;
    boolean exactlyAt = false;
--- 1187,1191 ----
    Token t;
    TypeIdent tc=null, additional = null;
!   TypeConstructor runtimeTC = null;
    Expression val = null;
    boolean exactlyAt = false;
***************
*** 1219,1223 ****
        |
          tc=typeIdent()
!         [ ":" type=monotype() ]
        )
      |
--- 1219,1223 ----
        |
          tc=typeIdent()
!         [ ":" runtimeTC = typeConstructor() ]
        )
      |
***************
*** 1230,1234 ****
    [ "(" additional=typeIdent() ")" ]
    {
!     return new Pattern(name, tc, val, exactlyAt, additional, type, loc);
    }
  }
--- 1230,1234 ----
    [ "(" additional=typeIdent() ")" ]
    {
!     return new Pattern(name, tc, val, exactlyAt, additional, runtimeTC, loc);
    }
  }
***************
*** 1268,1272 ****
      Pattern p;
      Collection binders=null;
-     List newTypeVars=null;
      LinkedList parameters=new LinkedList();
      Statement body;
--- 1268,1271 ----
***************
*** 1274,1280 ****
  }
  {
- // introducing new Type variables
-     [ "<" newTypeVars=typeConstructors() ">" ]
- 
      name=identOrBackquoted()
      [ "<" binders=strings() ">" ]
--- 1273,1276 ----
***************
*** 1288,1292 ****
      body = code()
      { return new MethodBodyDefinition(container,name,binders,
- 				      newTypeVars,
  				      parameters,body); }
  }
--- 1284,1287 ----