[Nice-commit] Nice/src/bossa/syntax monotype.nice,1.2,1.3 tools.nice,1.76,1.77

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

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

Modified Files:
	monotype.nice tools.nice 
Log Message:
Changed to String key in the Monotype.substitute Map.

Index: tools.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/tools.nice,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** tools.nice	17 Dec 2004 04:09:42 -0000	1.76
--- tools.nice	18 Dec 2004 18:18:13 -0000	1.77
***************
*** 272,277 ****
  ?String getParentFor(AtomicConstraint, mlsub.typing.TypeConstructor) = native String AtomicConstraint.getParentFor(mlsub.typing.TypeConstructor);
  mlsub.typing.AtomicConstraint resolve(AtomicConstraint, TypeScope) = native mlsub.typing.AtomicConstraint AtomicConstraint.resolve(TypeScope);
! bossa.syntax.Monotype substitute(bossa.syntax.Monotype,Map<TypeIdent,bossa.syntax.Monotype>) = native bossa.syntax.Monotype bossa.syntax.Monotype.substitute(Map);
! List<bossa.syntax.Monotype> substitute(Map<TypeIdent,bossa.syntax.Monotype>,Collection<bossa.syntax.Monotype>) = native List bossa.syntax.Monotype.substitute(Map,Collection);
  boolean containsAlike(List<bossa.syntax.Monotype>) = native boolean bossa.syntax.Monotype.containsAlike(List);
  mlsub.typing.Monotype[] rawResolve(TypeMap,Collection<bossa.syntax.Monotype>) = native mlsub.typing.Monotype[] bossa.syntax.Monotype.rawResolve(TypeMap, Collection);
--- 272,277 ----
  ?String getParentFor(AtomicConstraint, mlsub.typing.TypeConstructor) = native String AtomicConstraint.getParentFor(mlsub.typing.TypeConstructor);
  mlsub.typing.AtomicConstraint resolve(AtomicConstraint, TypeScope) = native mlsub.typing.AtomicConstraint AtomicConstraint.resolve(TypeScope);
! bossa.syntax.Monotype substitute(bossa.syntax.Monotype,Map<String,bossa.syntax.Monotype>) = native bossa.syntax.Monotype bossa.syntax.Monotype.substitute(Map);
! List<bossa.syntax.Monotype> substitute(Map<String,bossa.syntax.Monotype>,Collection<bossa.syntax.Monotype>) = native List bossa.syntax.Monotype.substitute(Map,Collection);
  boolean containsAlike(List<bossa.syntax.Monotype>) = native boolean bossa.syntax.Monotype.containsAlike(List);
  mlsub.typing.Monotype[] rawResolve(TypeMap,Collection<bossa.syntax.Monotype>) = native mlsub.typing.Monotype[] bossa.syntax.Monotype.rawResolve(TypeMap, Collection);
***************
*** 281,285 ****
  List<FormalParameters.Parameter> asList(FormalParameters) = native List FormalParameters.asList();
  boolean containsAlike(Monotype[]) = native boolean Monotype.containsAlike(Monotype[]);
! bossa.syntax.Monotype[] substitute(Map<TypeIdent,bossa.syntax.Monotype>,bossa.syntax.Monotype[]) = native bossa.syntax.Monotype[] bossa.syntax.Monotype.substitute(Map,bossa.syntax.Monotype[]);
  Monotype[?] types(FormalParameters) = native Monotype[] FormalParameters.types();
  ?mlsub.typing.TypeSymbol lookup(TypeMap, LocatedString) = native mlsub.typing.TypeSymbol TypeMap.lookup(LocatedString);
--- 281,285 ----
  List<FormalParameters.Parameter> asList(FormalParameters) = native List FormalParameters.asList();
  boolean containsAlike(Monotype[]) = native boolean Monotype.containsAlike(Monotype[]);
! bossa.syntax.Monotype[] substitute(Map<String,bossa.syntax.Monotype>,bossa.syntax.Monotype[]) = native bossa.syntax.Monotype[] bossa.syntax.Monotype.substitute(Map,bossa.syntax.Monotype[]);
  Monotype[?] types(FormalParameters) = native Monotype[] FormalParameters.types();
  ?mlsub.typing.TypeSymbol lookup(TypeMap, LocatedString) = native mlsub.typing.TypeSymbol TypeMap.lookup(LocatedString);

Index: monotype.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/monotype.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** monotype.nice	16 Dec 2004 16:21:07 -0000	1.2
--- monotype.nice	18 Dec 2004 18:18:13 -0000	1.3
***************
*** 58,65 ****
    substitute(map)
    {
-     let TypeIdent newTC = cast(map.get(notNull(tc))) || notNull(tc);
-     
      Monotype res = createMonotypeConstructor
!       (newTC,
         new TypeParameters(Monotype.substitute(map, notNull(parameters.content))),
         loc);
--- 58,63 ----
    substitute(map)
    {
      Monotype res = createMonotypeConstructor
!       (notNull(tc),
         new TypeParameters(Monotype.substitute(map, notNull(parameters.content))),
         loc);