CVS: sml-dist/src/compiler/FLINT/plambda chkplexp.sml, 1.9.10.10, 1.9.10.11 flintnm.sml, 1.17.10.18, 1.17.10.19 pplexp.sml, 1.4.10.4, 1.4.10.5
David MacQueen <[email protected]> Sun, 27 Aug 2006 22:12:13 -0700
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26302/src/compiler/FLINT/plambda
Modified Files:
Tag: primop-branch-2
chkplexp.sml flintnm.sml pplexp.sml
Log Message:
switched all pretty printing to use PrettyPrintNew
Index: chkplexp.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda/chkplexp.sml,v
retrieving revision 1.9.10.10
retrieving revision 1.9.10.11
diff -C2 -d -r1.9.10.10 -r1.9.10.11
*** chkplexp.sml 24 Aug 2006 23:03:10 -0000 1.9.10.10
--- chkplexp.sml 28 Aug 2006 05:12:11 -0000 1.9.10.11
***************
*** 97,101 ****
PP.newline stm))
! fun lePrint le = PPLexp.printLexp (simplify(le, 3))
(*** a hack for type checking ***)
--- 97,102 ----
PP.newline stm))
! fun lePrint le =
! with_pp(fn ppstrm => PPLexp.ppLexp 20 ppstrm (simplify(le, 3)))
(*** a hack for type checking ***)
***************
*** 165,169 ****
say (s ^ " **** Lty conflicting in lexp =====> \n ");
ltPrint t1; say "\n and \n "; ltPrint t2;
! say "\n \n"; PPLexp.printLexp le;
say "***************************************************** \n"))
handle zz =>
--- 166,170 ----
say (s ^ " **** Lty conflicting in lexp =====> \n ");
ltPrint t1; say "\n and \n "; ltPrint t2;
! say "\n \n"; with_pp(fn s => PPLexp.ppLexp 20 s le);
say "***************************************************** \n"))
handle zz =>
***************
*** 171,175 ****
say (s ^ " **** Lty conflicting in lexp =====> \n ");
say "uncaught exception found ";
! say "\n \n"; PPLexp.printLexp le; say "\n";
ltPrint t1; say "\n and \n "; ltPrint t2; say "\n";
say "***************************************************** \n")
--- 172,176 ----
say (s ^ " **** Lty conflicting in lexp =====> \n ");
say "uncaught exception found ";
! say "\n \n"; with_pp(fn s => PPLexp.ppLexp 20 s le); say "\n";
ltPrint t1; say "\n and \n "; ltPrint t2; say "\n";
say "***************************************************** \n")
***************
*** 247,251 ****
say (msg);
say ("***\n Term: ");
! PPLexp.printLexp lexp;
say ("\n Kind check error: ");
say kndchkmsg;
--- 248,252 ----
say (msg);
say ("***\n Term: ");
! with_pp(fn s => PPLexp.ppLexp 20 s lexp);
say ("\n Kind check error: ");
say kndchkmsg;
Index: flintnm.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda/flintnm.sml,v
retrieving revision 1.17.10.18
retrieving revision 1.17.10.19
diff -C2 -d -r1.17.10.18 -r1.17.10.19
*** flintnm.sml 23 Aug 2006 23:44:17 -0000 1.17.10.18
--- flintnm.sml 28 Aug 2006 05:12:11 -0000 1.17.10.19
***************
*** 47,51 ****
fun debugLexp (lexp) =
! if !debugging2 then PPLexp.printLexp lexp else ()
val mkv = LambdaVar.mkLvar
--- 47,53 ----
fun debugLexp (lexp) =
! if !debugging2 then
! PP.with_default_pp(fn ppstrm => PPLexp.ppLexp 20 ppstrm lexp)
! else ()
val mkv = LambdaVar.mkLvar
Index: pplexp.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/FLINT/plambda/pplexp.sml,v
retrieving revision 1.4.10.4
retrieving revision 1.4.10.5
diff -C2 -d -r1.4.10.4 -r1.4.10.5
*** pplexp.sml 27 Aug 2006 18:50:10 -0000 1.4.10.4
--- pplexp.sml 28 Aug 2006 05:12:11 -0000 1.4.10.5
***************
*** 9,15 ****
val conToString : PLambda.con -> string
val ppLexp : int -> PrettyPrintNew.stream -> PLambda.lexp -> unit
! val printMatch : StaticEnv.staticEnv ->
! (Absyn.pat * PLambda.lexp) list -> unit
! val printFun : PrettyPrintNew.stream -> PLambda.lexp -> LambdaVar.lvar -> unit
val stringTag : PLambda.lexp -> string
--- 9,15 ----
val conToString : PLambda.con -> string
val ppLexp : int -> PrettyPrintNew.stream -> PLambda.lexp -> unit
! val ppMatch : StaticEnv.staticEnv ->
! (Absyn.pat * PLambda.lexp) list -> unit
! val ppFun : PrettyPrintNew.stream -> PLambda.lexp -> LambdaVar.lvar -> unit
val stringTag : PLambda.lexp -> string
***************
*** 350,357 ****
end
! fun printMatch env (rules: (Absyn.pat * lexp) list) =
let val pd = !Control.Print.printDepth
! in PP.with_default_pp (fn ppstrm =>
! let fun ppMatch ((p,r)::more) =
(PP.openHVBox ppstrm (PP.Rel 0);
PP.openHOVBox ppstrm (PP.Rel 2);
--- 350,357 ----
end
! (* ppMatch : StaticEnv.statenv * (Absyn.pat * lexp) list -> unit *)
! fun ppMatch env (rules: (Absyn.pat * lexp) list) =
let val pd = !Control.Print.printDepth
! fun ppMatch' ppstrm ((p,r)::more) =
(PP.openHVBox ppstrm (PP.Rel 0);
PP.openHOVBox ppstrm (PP.Rel 2);
***************
*** 361,369 ****
PP.closeBox ppstrm;
PP.newline ppstrm;
! ppMatch more;
PP.closeBox ppstrm)
! | ppMatch [] = ()
! in ppMatch rules
! end)
end
--- 361,368 ----
PP.closeBox ppstrm;
PP.newline ppstrm;
! ppMatch' ppstrm more;
PP.closeBox ppstrm)
! | ppMatch' _ [] = ()
! in PP.with_default_pp (fn ppstrm => ppMatch' ppstrm rules)
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