[Nice-commit] Nice/src/bossa/parser Parser.jj,1.302,1.303

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

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

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

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.302
retrieving revision 1.303
diff -C2 -d -r1.302 -r1.303
*** Parser.jj	12 Jan 2005 20:56:28 -0000	1.302
--- Parser.jj	12 Jan 2005 22:06:50 -0000	1.303
***************
*** 822,826 ****
  |
    ("unknown"  | "?")
!   { return new Monotype.MonotypeWrapper(mlsub.typing.UnknownMonotype.instance); }
  }
  
--- 822,826 ----
  |
    ("unknown"  | "?")
!   { return new MonotypeWrapper(mlsub.typing.UnknownMonotype.instance); }
  }
  
***************
*** 873,877 ****
    LOOKAHEAD(monotype())
    t=monotype() [ id=ident() [ "=" val=Expression() ]]
!   { return bossa.syntax.dispatch.createParameter(t, id ,val); }
  |
    { Token first,last;
--- 873,877 ----
    LOOKAHEAD(monotype())
    t=monotype() [ id=ident() [ "=" val=Expression() ]]
!   { return t.createParameter(id ,val); }
  |
    { Token first,last;
***************
*** 895,899 ****
      t.nullness = /*absent*/3;
  
!     return bossa.syntax.dispatch.createParameter(t, ident ,val);
    }
  )  
--- 895,899 ----
      t.nullness = /*absent*/3;
  
!     return t.createParameter(ident ,val);
    }
  )  
***************
*** 1218,1222 ****
        {
          bound.nullness = /*absent*/3;
!         atoms.add(new MonotypeLeqCst(new Monotype.MonotypeVarWrapper(mv), bound)); 
        }
  
--- 1218,1222 ----
        {
          bound.nullness = /*absent*/3;
!         atoms.add(new MonotypeLeqCst(new MonotypeVarWrapper(mv), bound)); 
        }