CVS: sml-dist/src/compiler/ElabData/types typesutil.sig, 1.2.20.3, 1.2.20.4 typesutil.sml, 1.3.2.7, 1.3.2.8

George Kuan <[email protected]> Fri, 07 Jul 2006 14:32:45 -0700
Newsgroups gmane.comp.lang.sml.smlnj.commits
Message-ID <[email protected]>
Update of /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12298/types

Modified Files:
      Tag: primop-branch-2
	typesutil.sig typesutil.sml 
Log Message:
fixed some typesutil syntax and signature specs

Index: typesutil.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types/typesutil.sig,v
retrieving revision 1.2.20.3
retrieving revision 1.2.20.4
diff -C2 -d -r1.2.20.3 -r1.2.20.4
*** typesutil.sig	7 Jul 2006 21:06:09 -0000	1.2.20.3
--- typesutil.sig	7 Jul 2006 21:32:42 -0000	1.2.20.4
***************
*** 66,70 ****
  
    val matchInstTypes : Types.ty * Types.ty -> 
!                          (Types.tyvar list * Types.tyvar list) option
     (* matchInstTypes probably supercedes compareTypes, and if so,
      * compareTypes should be deleted *)
--- 66,70 ----
  
    val matchInstTypes : Types.ty * Types.ty -> 
!                          (Types.ty list * Types.ty list) option
     (* matchInstTypes probably supercedes compareTypes, and if so,
      * compareTypes should be deleted *)

Index: typesutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types/typesutil.sml,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -C2 -d -r1.3.2.7 -r1.3.2.8
*** typesutil.sml	7 Jul 2006 21:06:09 -0000	1.3.2.7
--- typesutil.sml	7 Jul 2006 21:32:42 -0000	1.3.2.8
***************
*** 580,588 ****
      let	fun match'(WILDCARDty, _) = () (* possible? how? *)
  	  | match'(_, WILDCARDty) = () (* possible? how? *)
! 	  | match'(ty1, VARty(tv as ref(OPEN{kind=META,eq,...})) =
                if eq andalso not(checkEqTyInst(ty1))
  	      then raise CompareTypes
  	      else tv := INSTANTIATED ty1
! 	  | match'(ty1, VARty(tv as ref(INSTANTIATED ty2)) =
                if equalType(ty1,ty2) then () else raise CompareTypes
  	  | match'(CONty(tycon1, args1), CONty(tycon2, args2)) =
--- 580,588 ----
      let	fun match'(WILDCARDty, _) = () (* possible? how? *)
  	  | match'(_, WILDCARDty) = () (* possible? how? *)
! 	  | match'(ty1, VARty(tv as ref(OPEN{kind=META,eq,...}))) =
                if eq andalso not(checkEqTyInst(ty1))
  	      then raise CompareTypes
  	      else tv := INSTANTIATED ty1
! 	  | match'(ty1, VARty(tv as ref(INSTANTIATED ty2))) =
                if equalType(ty1,ty2) then () else raise CompareTypes
  	  | match'(CONty(tycon1, args1), CONty(tycon2, args2)) =


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