CVS: sml-dist/src/compiler/ElabData/types typesutil.sml, 1.3.2.5, 1.3.2.6

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

Modified Files:
      Tag: primop-branch-2
	typesutil.sml 
Log Message:
Shifted VARexp, CONexp, CONpat back to carrying ty list (for determining type app parameters in FLINT)

Index: typesutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types/typesutil.sml,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** typesutil.sml	6 Jul 2006 03:07:17 -0000	1.3.2.5
--- typesutil.sml	6 Jul 2006 15:00:39 -0000	1.3.2.6
***************
*** 524,537 ****
               this function or anywhere else that uses compareTypes or
  	     matchTypes. 
   *)
  fun matchTypes (specTy, actualTy) =
!     (* If specTy is not an instance of actualTy, then give up. *)
      if compareTypes(specTy, actualTy) then
  	let
! 	    val (actinst, actParamTvs) =
! 		instantiatePoly actual
!             val (specinst, specGenericTvs) =
! 		instantiatePoly spec
  	in 
  	    (specGenericTvs, actParamTvs)
  	end
--- 524,542 ----
               this function or anywhere else that uses compareTypes or
  	     matchTypes. 
+ 
+    matchTypes is used in SigMatch for matching structures (matchStr1) only
   *)
  fun matchTypes (specTy, actualTy) =
!     (* If specTy is an instance of actualTy, 
!        then match, otherwise give up. *)
      if compareTypes(specTy, actualTy) then
+ 	(* compareTypes should have already determined that the 
+ 	   two types match. *)
  	let
! 	    val (actinst, actParamTvs) = instantiatePoly actualTy
!             val (specinst, specGenericTvs) = instantiatePoly specTy
  	in 
+ 	    (* These metavariable lists may be empty if either actualTy
+ 	       or specTy are monomorphic *)
  	    (specGenericTvs, actParamTvs)
  	end


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