CVS: sml-dist/src/compiler/ElabData/types typesutil.sml, 1.3.2.11, 1.3.2.12

Update of /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23408/src/compiler/ElabData/types

Modified Files:
      Tag: primop-branch-2
	typesutil.sml 
Log Message:
primOpTypeMap addition now compiles...makeml still does not work

Index: typesutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types/typesutil.sml,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -C2 -d -r1.3.2.11 -r1.3.2.12
*** typesutil.sml	12 Jul 2006 15:43:13 -0000	1.3.2.11
--- typesutil.sml	13 Jul 2006 21:10:44 -0000	1.3.2.12
***************
*** 314,321 ****
    | equalTycon(t1,t2) =
       let val a1 = tyconArity t1 and a2 = tyconArity t2
!       in if a1<>a2 then false
!          else let val args = dummyargs a1
! 	       in equalType(mkCONty(t1,args),mkCONty(t2,args))
! 	      end
       end
  
--- 314,321 ----
    | equalTycon(t1,t2) =
       let val a1 = tyconArity t1 and a2 = tyconArity t2
!       in a1=a2 andalso
!          (let val args = dummyargs a1
! 	  in equalType(mkCONty(t1,args),mkCONty(t2,args))
! 	  end)
       end
  
***************
*** 617,626 ****
          val a0 = String.sub(a',0) and b0 = String.sub(b',0)
       in if Char.isDigit a0
! 	  then if Char.isDigit b0
! 	    then (size a' > size b' orelse size a' = size b' andalso a' > b')
! 	    else false
! 	  else if Char.isDigit b0
! 	    then true
! 	    else (a' > b')
      end
  
--- 617,623 ----
          val a0 = String.sub(a',0) and b0 = String.sub(b',0)
       in if Char.isDigit a0
! 	  then Char.isDigit b0
! 	    andalso (size a' > size b' orelse size a' = size b' andalso a' > b')
! 	  else Char.isDigit b0 orelse (a' > b')
      end
  
***************
*** 822,826 ****
  
    fun filterSet(ty, tycs) = 
!     let fun inList (a::r, tc) = if eqTycon(a, tc) then true else inList(r, tc)
            | inList ([], tc) = false
  
--- 819,823 ----
  
    fun filterSet(ty, tycs) = 
!     let fun inList (a::r, tc) = eqTycon(a, tc) orelse inList(r, tc)
            | inList ([], tc) = false
  



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642