CVS: sml-dist/src/compiler/ElabData/types typesutil.sml, 1.3.2.14, 1.3.2.15

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

Modified Files:
      Tag: primop-branch-2
	typesutil.sml 
Log Message:
commented out some Translator and TypesUtil debugging info

Index: typesutil.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/ElabData/types/typesutil.sml,v
retrieving revision 1.3.2.14
retrieving revision 1.3.2.15
diff -C2 -d -r1.3.2.14 -r1.3.2.15
*** typesutil.sml	18 Jul 2006 01:10:33 -0000	1.3.2.14
--- typesutil.sml	18 Jul 2006 02:39:07 -0000	1.3.2.15
***************
*** 157,163 ****
  
  fun prune(VARty(tv as ref(INSTANTIATED ty))) : ty =
!       let val _ = print "prune VARty\n"
  	  val pruned = prune ty
! 	  val _ = print "pruned VARty\n"
         in tv := INSTANTIATED pruned; pruned
        end
--- 157,163 ----
  
  fun prune(VARty(tv as ref(INSTANTIATED ty))) : ty =
!       let (* val _ = print "prune VARty\n" *)
  	  val pruned = prune ty
! 	  (* val _ = print "pruned VARty\n" *)
         in tv := INSTANTIATED pruned; pruned
        end
***************
*** 165,171 ****
      
  fun pruneTyvar(tv as ref(INSTANTIATED ty)) : ty =
!       let val _ = print "pruneTyvar\n"
  	  val pruned = prune ty
! 	  val _ = print "pruned\n"
         in tv := INSTANTIATED pruned; pruned
        end
--- 165,171 ----
      
  fun pruneTyvar(tv as ref(INSTANTIATED ty)) : ty =
!       let (* val _ = print "pruneTyvar\n" *)
  	  val pruned = prune ty
! 	  (* val _ = print "pruned\n" *)
         in tv := INSTANTIATED pruned; pruned
        end
***************
*** 562,568 ****
      let	fun match'(WILDCARDty, _) = raise WILDCARDmatch (* possible? how? *)
  	  | match'(_, WILDCARDty) = raise WILDCARDmatch (* possible? how? *)
! 	  | match'(ty1, VARty(tv as ref(OPEN{kind=META,eq,...}))) =
                if eq andalso not(checkEqTyInst(ty1))
  	      then (print "VARty META\n"; raise CompareTypes)
  	      else tv := INSTANTIATED ty1
  	  | match'(ty1, VARty(tv as ref(INSTANTIATED ty2))) =
--- 562,570 ----
      let	fun match'(WILDCARDty, _) = raise WILDCARDmatch (* possible? how? *)
  	  | match'(_, WILDCARDty) = raise WILDCARDmatch (* possible? how? *)
! 	  | match'(ty1, ty2 as VARty(tv as ref(OPEN{kind=META,eq,...}))) =
                if eq andalso not(checkEqTyInst(ty1))
  	      then (print "VARty META\n"; raise CompareTypes)
+ 	      else if equalType(ty1, ty2) 
+ 	      then (* (print "matching Equal Tyvars\n") *) ()
  	      else tv := INSTANTIATED ty1
  	  | match'(ty1, VARty(tv as ref(INSTANTIATED ty2))) =
***************
*** 582,586 ****
  	  | match'(_, CONty _) = (print "unmatched CONty\n"; raise CompareTypes)
  	  | match'(t1, VARty vk) = (print "VARty other\n"; 
! 				  (case vk of 
  				       (ref (OPEN _)) => print "open\n"
  				     | (ref (UBOUND _)) => print "ubound\n"
--- 584,588 ----
  	  | match'(_, CONty _) = (print "unmatched CONty\n"; raise CompareTypes)
  	  | match'(t1, VARty vk) = (print "VARty other\n"; 
! 				 (* (case vk of 
  				       (ref (OPEN _)) => print "open\n"
  				     | (ref (UBOUND _)) => print "ubound\n"
***************
*** 600,604 ****
  								  print "SCHEME\n"
  								| (POLYty _) => print "POLYty\n"))
! 				     | (ref (INSTANTIATED _)) => print "inst'ed\n");
  				  raise CompareTypes)
          and match(ty1,ty2) = match'(headReduceType ty1, headReduceType ty2)
--- 602,606 ----
  								  print "SCHEME\n"
  								| (POLYty _) => print "POLYty\n"))
! 				     | (ref (INSTANTIATED _)) => print "inst'ed\n");*)
  				  raise CompareTypes)
          and match(ty1,ty2) = match'(headReduceType ty1, headReduceType ty2)


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV