CVS: sml-dist/src/compiler/FLINT/plambda flintnm.sml, 1.17.10.15, 1.17.10.16 pplexp.sml, 1.4.10.1, 1.4.10.2

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

Modified Files:
      Tag: primop-branch-2
	flintnm.sml pplexp.sml 
Log Message:
broke ltykernel into lty and ltykernel, improved pplty

Index: flintnm.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda/flintnm.sml,v
retrieving revision 1.17.10.15
retrieving revision 1.17.10.16
diff -C2 -d -r1.17.10.15 -r1.17.10.16
*** flintnm.sml	11 Aug 2006 04:09:23 -0000	1.17.10.15
--- flintnm.sml	11 Aug 2006 20:42:24 -0000	1.17.10.16
***************
*** 21,24 ****
--- 21,26 ----
        structure DA = Access
        structure BT = BasicTypes
+       structure PP = PrettyPrintNew
+       structure PU = PPUtilNew
  in
  
***************
*** 30,33 ****
--- 32,38 ----
      if !debugging then (say msg; say "\n") else ()
  
+ fun ppTycEnv tenv = 
+     PP.with_default_pp
+       (fn ppstrm => (PPLty.ppTycEnv 20 ppstrm tenv; PU.pps ppstrm "\n"))
  
  val mkv = LambdaVar.mkLvar
***************
*** 405,411 ****
  
  fun ppTycEnv tenv = 
!     PrettyPrintNew.with_default_pp (fn ppstrm => PPLTy.ppTycEnv ppstrm tenv)
  fun ppTyc tyc =
!     PrettyPrintNew.with_default_pp (fn ppstrm => PPLTy.ppTyc ppstrm tyc)
  
  	fun f [] (vals,ltys) = cont (rev vals, rev ltys)
--- 410,416 ----
  
  fun ppTycEnv tenv = 
!     PrettyPrintNew.with_default_pp (fn ppstrm => PPLty.ppTycEnv 20 ppstrm tenv)
  fun ppTyc tyc =
!     PrettyPrintNew.with_default_pp (fn ppstrm => PPLty.ppTyc 20 ppstrm tyc)
  
  	fun f [] (vals,ltys) = cont (rev vals, rev ltys)
***************
*** 418,427 ****
  		    f lexps (v::vals, lty::ltys)))) 
  	    (* handle LtyKernel.tcUnbound (tenv,tyc) => 
! 		   (print "\n*** lexps2values ***\nlexp: \n"; 
! 		    PPLexp.printLexp lexp;
! 		    print "\ntype: \n";
! 		    ppTyc tyc;
! 		    print "\ntenv: \n";
! 		    ppTycEnv tenv; raise LtyKernel.tcUnbound (tenv,tyc)) *)
  	val v = f lexps ([], [])
  	val _ = debugmsg "<<lexp2values"
--- 423,435 ----
  		    f lexps (v::vals, lty::ltys)))) 
  	    (* handle LtyKernel.tcUnbound (tenv,tyc) => 
! 		   (with_pp(fn s =>
!                       (PU.pps s "*** lexps2values ***; PP.newline s;
!                        lexp: \n"; 
! 		       PPLexp.printLexp lexp;
! 		       print "\ntype: \n";
! 		       ppTyc 20 s tyc; PP.newline s;
! 		       PU.pps s "tenv:"; PP.newline s;
! 		       ppTycEnv 20 s tenv;
!                        raise LtyKernel.tcUnbound (tenv,tyc)))) *)
  	val v = f lexps ([], [])
  	val _ = debugmsg "<<lexp2values"

Index: pplexp.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda/pplexp.sml,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -C2 -d -r1.4.10.1 -r1.4.10.2
*** pplexp.sml	8 Aug 2006 19:32:53 -0000	1.4.10.1
--- pplexp.sml	11 Aug 2006 20:42:24 -0000	1.4.10.2
***************
*** 23,26 ****
--- 23,27 ----
        structure S = Symbol
        structure PP = PrettyPrint
+       structure PPN = PrettyPrintNew
        structure PU = PrintUtil
        structure LT = PLambdaType
***************
*** 112,117 ****
  fun printLexp l = 
    let fun prLty t = say (LT.lt_print t)
!       fun prTyc t = PrettyPrintNew.with_default_pp 
! 			(fn ppstrm => PPLTy.ppTyc ppstrm t)
                       (* say (LT.tc_print t) *)
        fun prKnd k = say (LT.tk_print k)
--- 113,119 ----
  fun printLexp l = 
    let fun prLty t = say (LT.lt_print t)
!       fun prTyc t = PPN.with_default_pp 
! 			(fn ppstrm => (PPLty.ppTyc 20 ppstrm t;
!                                        PPN.flushStream ppstrm))
                       (* say (LT.tc_print t) *)
        fun prKnd k = say (LT.tk_print k)


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