CVS: sml-dist/src/compiler/FLINT/flint tvarcvt.sml, 1.6.26.2, 1.6.26.3

Update of /cvsroot/smlnj/sml-dist/src/compiler/FLINT/flint
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19573/src/compiler/FLINT/flint

Modified Files:
      Tag: primop-branch-2
	tvarcvt.sml 
Log Message:
debugging plambda type checking

Index: tvarcvt.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/flint/tvarcvt.sml,v
retrieving revision 1.6.26.2
retrieving revision 1.6.26.3
diff -C2 -d -r1.6.26.2 -r1.6.26.3
*** tvarcvt.sml	17 Aug 2006 23:13:13 -0000	1.6.26.2
--- tvarcvt.sml	21 Aug 2006 23:07:05 -0000	1.6.26.3
***************
*** 29,38 ****
          fun extendEnv env d _ tvtks = let
              val (tvars,ks) = ListPair.unzip tvtks
-             fun tvtk2tyc (tvar, _) = LT.tcc_nvar tvar
          in
              Lty.teCons(Lty.Beta(0,map LT.tcc_nvar tvars,ks), env)
          end
  
!         fun cvtExp env d = let
              fun tcSubst tyc = LK.tcc_env (tyc, d, d, env)
              fun ltSubst lty = LK.ltc_env (lty, d, d, env)
--- 29,37 ----
          fun extendEnv env d _ tvtks = let
              val (tvars,ks) = ListPair.unzip tvtks
          in
              Lty.teCons(Lty.Beta(0,map LT.tcc_nvar tvars,ks), env)
          end
  
!         fun cvtExp (env: Lty.tycEnv) (d: int) = let
              fun tcSubst tyc = LK.tcc_env (tyc, d, d, env)
              fun ltSubst lty = LK.ltc_env (lty, d, d, env)
***************
*** 117,140 ****
          end (* cvtExp *)            
  
!         and cvtFundec env d (fkind, lvar, lvlts, e) = let
!             fun tcSubst tyc = LK.tcc_env (tyc, d, d, env)
!             fun ltSubst lty = LK.ltc_env (lty, d, d, env)
  
!             fun cvtFkind {isrec = SOME(ltys,lk),
!                                     cconv, known, inline} =
!                 {isrec = SOME (map ltSubst ltys, lk),
! 		 cconv = cconv,
! 		 known = known,
! 		 inline = inline}
!               | cvtFkind fk = fk
  
!             fun cvtLvLt (lvar, lty) = (lvar, ltSubst lty)
!         in
!             (cvtFkind fkind, 
!              lvar,
!              map cvtLvLt lvlts,
!              cvtExp env d e
!              ) : F.fundec
!         end (* cvtFundec *)
      in
          cvtFundec Lty.teEmpty DI.top
--- 116,137 ----
          end (* cvtExp *)            
  
!         and cvtFundec env d (fkind, lvar, lvlts, e) =
!             let fun ltSubst lty = LK.ltc_env (lty, d, d, env)
  
!                 fun cvtFkind {isrec = SOME(ltys,lk),
!                               cconv, known, inline} =
!                     {isrec = SOME (map ltSubst ltys, lk),
! 		     cconv = cconv,
! 		     known = known,
! 		     inline = inline}
!                   | cvtFkind fk = fk
  
!                 fun cvtLvLt (lvar, lty) = (lvar, ltSubst lty)
!             in (cvtFkind fkind, 
!                 lvar,
!                 map cvtLvLt lvlts,
!                 cvtExp env d e
!                ) : F.fundec
!             end (* cvtFundec *)
      in
          cvtFundec Lty.teEmpty DI.top


-------------------------------------------------------------------------
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