[Nice-commit] Nice/src/bossa/parser Parser.jj,1.285,1.286

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

Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7828/F:/nice/src/bossa/parser

Modified Files:
	Parser.jj 
Log Message:
Converted TypeIdent.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.285
retrieving revision 1.286
diff -C2 -d -r1.285 -r1.286
*** Parser.jj	16 Dec 2004 20:18:46 -0000	1.285
--- Parser.jj	18 Dec 2004 19:40:57 -0000	1.286
***************
*** 674,678 ****
        last=getToken(0);
  
!       return bossa.syntax.dispatch.createMonotypeConstructor(t,new TypeParameters(p),
  				     makeLocation(first, last)); 
      }
--- 674,678 ----
        last=getToken(0);
  
!       return bossa.syntax.fun.createMonotypeConstructor(t,new TypeParameters(p),
  				     makeLocation(first, last)); 
      }
***************
*** 761,765 ****
      tp.add(res);
      Location loc = res.location();
!     res = bossa.syntax.dispatch.createMonotypeConstructor
        (new TypeIdent(new LocatedString("nice.lang.Array", loc)),
         new TypeParameters(tp),
--- 761,765 ----
      tp.add(res);
      Location loc = res.location();
!     res = bossa.syntax.fun.createMonotypeConstructor
        (new TypeIdent(new LocatedString("nice.lang.Array", loc)),
         new TypeParameters(tp),
***************
*** 935,939 ****
      // they should be checked
      [ "<" params = monotypes() ">" ]
!   { return bossa.syntax.dispatch.createMonotypeConstructor(name, params == null ? null : new TypeParameters(params), name.location()); }
  }
  
--- 935,939 ----
      // they should be checked
      [ "<" params = monotypes() ">" ]
!   { return bossa.syntax.fun.createMonotypeConstructor(name, params == null ? null : new TypeParameters(params), name.location()); }
  }
  
***************
*** 1279,1288 ****
    ]  
    name=ident()
!   { return bossa.syntax.dispatch.createPattern(tc, name, false, additional, runtimeTC); }
  |
    "#" tc=typeIdent() 
    [ "(" additional=typeIdent() ")" ] 
    [ name=ident() ] 
!   { return bossa.syntax.dispatch.createPattern(tc, name, true, additional, null); }
  |
    ( 
--- 1279,1288 ----
    ]  
    name=ident()
!   { return bossa.syntax.fun.createPattern(tc, name, false, additional, runtimeTC); }
  |
    "#" tc=typeIdent() 
    [ "(" additional=typeIdent() ")" ] 
    [ name=ident() ] 
!   { return bossa.syntax.fun.createPattern(tc, name, true, additional, null); }
  |
    ( 
***************
*** 1294,1298 ****
      [ "(" additional=typeIdent() ")" ]
      { User.warning(tc.location(), "This syntax is deprecated, use 'Type paramName' instead.");
!       return bossa.syntax.dispatch.createPattern(tc, null, false, additional, null);
      }
    |
--- 1294,1298 ----
      [ "(" additional=typeIdent() ")" ]
      { User.warning(tc.location(), "This syntax is deprecated, use 'Type paramName' instead.");
!       return bossa.syntax.fun.createPattern(tc, null, false, additional, null);
      }
    |
***************
*** 1303,1312 ****
        [ ":" runtimeTC=typeConstructor() ]
        [ "(" additional=typeIdent() ")" ]
!       { return bossa.syntax.dispatch.createPattern(tc, name, false, additional, runtimeTC); }
      |
        "#" tc=typeIdent() 
        [ "(" additional=typeIdent() ")" ] 
        { User.warning(name.location(), "This syntax is deprecated, use '#Type paramName' instead.");
!         return bossa.syntax.dispatch.createPattern(tc, name, true, additional, null);
        }
      |
--- 1303,1312 ----
        [ ":" runtimeTC=typeConstructor() ]
        [ "(" additional=typeIdent() ")" ]
!       { return bossa.syntax.fun.createPattern(tc, name, false, additional, runtimeTC); }
      |
        "#" tc=typeIdent() 
        [ "(" additional=typeIdent() ")" ] 
        { User.warning(name.location(), "This syntax is deprecated, use '#Type paramName' instead.");
!         return bossa.syntax.fun.createPattern(tc, name, true, additional, null);
        }
      |
***************
*** 1690,1694 ****
      { Arguments arguments; }
      arguments = arguments(false)
!     { e = bossa.syntax.dispatch.createNewExp(classe, arguments); 
        e.setLocation(makeLocation(t));
        return e;
--- 1690,1694 ----
      { Arguments arguments; }
      arguments = arguments(false)
!     { e = bossa.syntax.fun.createNewExp(classe, arguments); 
        e.setLocation(makeLocation(t));
        return e;