Nice/src/bossa/syntax monotype.nice,1.14,1.15 constraint.nice,1.4,1.5

Daniel Bonniot <[email protected]> Fri, 27 May 2005 21:12:30 +0000
Newsgroups gmane.comp.lang.nice.cvs
Message-ID <[email protected]>
Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22810/src/bossa/syntax

Modified Files:
	monotype.nice constraint.nice 
Log Message:
Mark all constraint monotype variables, since they can be used with markers
before they are used without them, making it too late to mark them at that time.


Index: constraint.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/constraint.nice,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** constraint.nice	9 Apr 2005 09:24:43 -0000	1.4
--- constraint.nice	27 May 2005 21:12:28 -0000	1.5
***************
*** 26,29 ****
--- 26,35 ----
    private List<AtomicConstraint> atomics;
  
+     {
+       for (b : binders)
+ 	if (b instanceof mlsub.typing.MonotypeVar)
+ 	  nice.tools.typing.Types.makeMarkedType(b);
+     }
+ 
    /**
     * Returns a new constraint.

Index: monotype.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/monotype.nice,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** monotype.nice	10 Apr 2005 14:57:07 -0000	1.14
--- monotype.nice	27 May 2005 21:12:28 -0000	1.15
***************
*** 61,68 ****
        {
  	if (raw instanceof mlsub.typing.MonotypeVar)
! 	  {
! 	    nice.tools.typing.Types.makeMarkedType(raw);
! 	    return raw;
! 	  }
  	else
  	  return sureMonotype(raw);
--- 61,65 ----
        {
  	if (raw instanceof mlsub.typing.MonotypeVar)
! 	  return raw;
  	else
  	  return sureMonotype(raw);



-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005