CVS: sml-dist/src/compiler/MiscUtil/print ppdec.sml, 1.7.10.1, 1.7.10.2 ppobj.sml, 1.13, 1.13.4.1 pptable.sml, 1.4, 1.4.10.1
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/MiscUtil/print
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26302/src/compiler/MiscUtil/print
Modified Files:
Tag: primop-branch-2
ppdec.sml ppobj.sml pptable.sml
Log Message:
switched all pretty printing to use PrettyPrintNew
Index: ppdec.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/MiscUtil/print/ppdec.sml,v
retrieving revision 1.7.10.1
retrieving revision 1.7.10.2
diff -C2 -d -r1.7.10.1 -r1.7.10.2
*** ppdec.sml 7 Jul 2006 21:06:10 -0000 1.7.10.1
--- ppdec.sml 28 Aug 2006 05:12:11 -0000 1.7.10.2
***************
*** 4,8 ****
signature PPDEC =
sig
! val ppDec : Environment.environment -> PrettyPrint.stream
-> (Absyn.dec * Access.lvar list) -> unit
val debugging : bool ref
--- 4,8 ----
signature PPDEC =
sig
! val ppDec : Environment.environment -> PrettyPrintNew.stream
-> (Absyn.dec * Access.lvar list) -> unit
val debugging : bool ref
***************
*** 16,22 ****
structure IP = InvPath
structure M = Modules
! structure V = VarCon structure PP = PrettyPrint
open Types VarCon Modules Bindings Fixity Absyn
! PrettyPrint PPUtil PPType PPObj Access
in
--- 16,24 ----
structure IP = InvPath
structure M = Modules
! structure V = VarCon
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
open Types VarCon Modules Bindings Fixity Absyn
! PrettyPrintNew PPUtilNew PPType PPObj Access
in
***************
*** 306,313 ****
openHVBox ppstrm (PP.Rel 0);
PP.string ppstrm (Fixity.fixityToString fixity);
! PPUtil.ppSequence ppstrm {sep=C break {nsp=1,offset=0},
! pr=PPUtil.ppSym,
! style=INCONSISTENT}
! ops;
closeBox ppstrm;
PP.newline ppstrm;
--- 308,315 ----
openHVBox ppstrm (PP.Rel 0);
PP.string ppstrm (Fixity.fixityToString fixity);
! PU.ppSequence ppstrm {sep=C break {nsp=1,offset=0},
! pr=PU.ppSym,
! style=INCONSISTENT}
! ops;
closeBox ppstrm;
PP.newline ppstrm;
Index: ppobj.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/MiscUtil/print/ppobj.sml,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -d -r1.13 -r1.13.4.1
*** ppobj.sml 25 Feb 2005 20:46:20 -0000 1.13
--- ppobj.sml 28 Aug 2006 05:12:11 -0000 1.13.4.1
***************
*** 9,13 ****
type object
val ppObj : StaticEnv.staticEnv
! -> PrettyPrint.stream
-> object * Types.ty * int
-> unit
--- 9,13 ----
type object
val ppObj : StaticEnv.staticEnv
! -> PrettyPrintNew.stream
-> object * Types.ty * int
-> unit
***************
*** 19,23 ****
struct
! structure PP = PrettyPrint
structure V = Vector
structure A = Access
--- 19,24 ----
struct
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
structure V = Vector
structure A = Access
***************
*** 28,32 ****
structure Obj = Unsafe.Object
! open PrettyPrint PPUtil
(* debugging *)
--- 29,33 ----
structure Obj = Unsafe.Object
! open PrettyPrintNew PPUtilNew
(* debugging *)
***************
*** 240,244 ****
PP.string ppstrm (Int32.toString(Obj.toInt32 obj))
else if TU.eqTycon(tyc,BT.intinfTycon) then
! PPUtil.pp_intinf ppstrm (Unsafe.cast obj)
else if TU.eqTycon(tyc,BT.wordTycon) then
ppWord (Word.toString(Obj.toWord obj))
--- 241,245 ----
PP.string ppstrm (Int32.toString(Obj.toInt32 obj))
else if TU.eqTycon(tyc,BT.intinfTycon) then
! PU.pp_intinf ppstrm (Unsafe.cast obj)
else if TU.eqTycon(tyc,BT.wordTycon) then
ppWord (Word.toString(Obj.toWord obj))
***************
*** 250,257 ****
PP.string ppstrm (Real.toString(Obj.toReal obj))
else if TU.eqTycon(tyc,BT.stringTycon) then
! PPUtil.pp_mlstr ppstrm (Obj.toString obj)
else if TU.eqTycon(tyc,BT.charTycon) then
(PP.string ppstrm "#";
! PPUtil.pp_mlstr ppstrm
(String.str(Char.chr(Obj.toInt obj))))
else if TU.eqTycon(tyc,BT.arrowTycon) then
--- 251,258 ----
PP.string ppstrm (Real.toString(Obj.toReal obj))
else if TU.eqTycon(tyc,BT.stringTycon) then
! PU.pp_mlstr ppstrm (Obj.toString obj)
else if TU.eqTycon(tyc,BT.charTycon) then
(PP.string ppstrm "#";
! PU.pp_mlstr ppstrm
(String.str(Char.chr(Obj.toInt obj))))
else if TU.eqTycon(tyc,BT.arrowTycon) then
Index: pptable.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/MiscUtil/print/pptable.sml,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -C2 -d -r1.4 -r1.4.10.1
*** pptable.sml 13 Aug 2003 18:04:07 -0000 1.4
--- pptable.sml 28 Aug 2006 05:12:11 -0000 1.4.10.1
***************
*** 5,12 ****
sig
exception PP_NOT_INSTALLED
! val pp_object : PrettyPrint.stream -> Stamps.stamp -> Unsafe.Object.object
-> unit
val install_pp : string list ->
! (PrettyPrint.stream -> Unsafe.Object.object -> unit) -> unit
end
--- 5,12 ----
sig
exception PP_NOT_INSTALLED
! val pp_object : PrettyPrintNew.stream -> Stamps.stamp -> Unsafe.Object.object
-> unit
val install_pp : string list ->
! (PrettyPrintNew.stream -> Unsafe.Object.object -> unit) -> unit
end
***************
*** 45,49 ****
fun install_pp (path_names: string list)
! (p: PrettyPrint.stream -> object -> unit) =
let val sym_path = make_path(path_names,[])
val tycon = Lookup.lookTyc ((#static(EnvRef.combined())),
--- 45,49 ----
fun install_pp (path_names: string list)
! (p: PrettyPrintNew.stream -> object -> unit) =
let val sym_path = make_path(path_names,[])
val tycon = Lookup.lookTyc ((#static(EnvRef.combined())),
-------------------------------------------------------------------------
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