CVS: sml-dist/src/compiler/Elaborator/print ppabsyn.sml, 1.5, 1.5.4.1 ppast.sig, 1.2, 1.2.10.1 ppast.sml, 1.2, 1.2.10.1 ppmod.sml, 1.3.10.5, 1.3.10.6 ppprim.sml, 1.1.2.2, 1.1.2.3 pptype.sml, 1.4, 1.4.10.1 ppval.sml, 1.3.10.3, 1.3.10.4
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/Elaborator/print
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26302/src/compiler/Elaborator/print
Modified Files:
Tag: primop-branch-2
ppabsyn.sml ppast.sig ppast.sml ppmod.sml ppprim.sml
pptype.sml ppval.sml
Log Message:
switched all pretty printing to use PrettyPrintNew
Index: ppabsyn.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppabsyn.sml,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** ppabsyn.sml 6 Oct 2004 20:18:54 -0000 1.5
--- ppabsyn.sml 28 Aug 2006 05:12:10 -0000 1.5.4.1
***************
*** 4,22 ****
signature PPABSYN =
sig
! val ppPat : StaticEnv.staticEnv -> PrettyPrint.stream
-> Absyn.pat * int -> unit
val ppExp : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Absyn.exp * int -> unit
val ppRule : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Absyn.rule * int -> unit
val ppVB : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Absyn.vb * int -> unit
[...1266 lines suppressed...]
***************
*** 796,803 ****
(case source_opt
of SOME source =>
! (ppsay "MARKfct(";
! ppFctexp'(body,d); ppsay ",";
! prpos(ppstrm,source,s); ppsay ",";
! prpos(ppstrm,source,e); ppsay ")")
| NONE => ppFctexp'(body,d))
--- 797,804 ----
(case source_opt
of SOME source =>
! (pps "MARKfct(";
! ppFctexp'(body,d); pps ",";
! prpos(ppstrm,source,s); pps ",";
! prpos(ppstrm,source,e); pps ")")
| NONE => ppFctexp'(body,d))
Index: ppast.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppast.sig,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -C2 -d -r1.2 -r1.2.10.1
*** ppast.sig 13 Aug 2003 18:04:06 -0000 1.2
--- ppast.sig 28 Aug 2006 05:12:10 -0000 1.2.10.1
***************
*** 7,50 ****
sig
val ppExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.exp * int -> unit
val ppPat :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.pat * int -> unit
val ppStrExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.strexp * int -> unit
val ppFctExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.fctexp * int -> unit
val ppWhereSpec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.wherespec * int -> unit
val ppSigExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.sigexp * int -> unit
val ppFsigExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.fsigexp * int -> unit
val ppSpec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.spec * int -> unit
val ppDec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.dec * int -> unit
val ppVb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.vb * int -> unit
val ppRvb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.rvb * int -> unit
val ppFb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> string -> Ast.fb * int -> unit
val ppClause : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.clause * int -> unit
val ppTb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.tb * int -> unit
val ppDb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.db * int -> unit
val ppDbrhs : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.dbrhs * int -> unit
val ppEb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.eb * int -> unit
val ppStrb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.strb * int -> unit
val ppFctb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.fctb * int -> unit
val ppTyvar : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.tyvar * int -> unit
val ppTy : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrint.stream -> Ast.ty * int -> unit
end
--- 7,50 ----
sig
val ppExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.exp * int -> unit
val ppPat :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.pat * int -> unit
val ppStrExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.strexp * int -> unit
val ppFctExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.fctexp * int -> unit
val ppWhereSpec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.wherespec * int -> unit
val ppSigExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.sigexp * int -> unit
val ppFsigExp :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.fsigexp * int -> unit
val ppSpec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.spec * int -> unit
val ppDec :StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.dec * int -> unit
val ppVb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.vb * int -> unit
val ppRvb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.rvb * int -> unit
val ppFb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> string -> Ast.fb * int -> unit
val ppClause : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.clause * int -> unit
val ppTb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.tb * int -> unit
val ppDb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.db * int -> unit
val ppDbrhs : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.dbrhs * int -> unit
val ppEb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.eb * int -> unit
val ppStrb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.strb * int -> unit
val ppFctb : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.fctb * int -> unit
val ppTyvar : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.tyvar * int -> unit
val ppTy : StaticEnv.staticEnv * Source.inputSource option
! -> PrettyPrintNew.stream -> Ast.ty * int -> unit
end
Index: ppast.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppast.sml,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -C2 -d -r1.2 -r1.2.10.1
*** ppast.sml 13 Aug 2003 18:04:06 -0000 1.2
--- ppast.sml 28 Aug 2006 05:12:10 -0000 1.2.10.1
***************
*** 10,16 ****
structure S = Symbol
structure BT = BasicTypes
! structure PP = PrettyPrint
! open Ast Tuples Fixity VarCon Types PrettyPrint PPUtil PPType PPVal
in
--- 10,17 ----
structure S = Symbol
structure BT = BasicTypes
[...1678 lines suppressed...]
! (ppSym ppstrm sym; pps ":"; ppTy context ppstrm (tv, d))
in ppClosedSequence ppstrm
{front=(C PP.string "{"),
***************
*** 1302,1308 ****
(if strength ty <= 1
then (openHOVBox ppstrm (PP.Rel 1);
! ppsay "(";
ppTy' (ty,d);
! ppsay ")";
closeBox ppstrm)
else ppTy' (ty,d);
--- 1308,1314 ----
(if strength ty <= 1
then (openHOVBox ppstrm (PP.Rel 1);
! pps "(";
ppTy' (ty,d);
! pps ")";
closeBox ppstrm)
else ppTy' (ty,d);
Index: ppmod.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppmod.sml,v
retrieving revision 1.3.10.5
retrieving revision 1.3.10.6
diff -C2 -d -r1.3.10.5 -r1.3.10.6
*** ppmod.sml 6 Aug 2006 06:05:08 -0000 1.3.10.5
--- ppmod.sml 28 Aug 2006 05:12:10 -0000 1.3.10.6
***************
*** 7,26 ****
signature PPMOD =
sig
! val ppSignature: PrettyPrint.stream
-> Modules.Signature * StaticEnv.staticEnv * int -> unit
! val ppStructure: PrettyPrint.stream
-> Modules.Structure * StaticEnv.staticEnv * int -> unit
! val ppOpen: PrettyPrint.stream
-> SymPath.path * Modules.Structure * StaticEnv.staticEnv * int -> unit
! val ppStructureName : PrettyPrint.stream
-> Modules.Structure * StaticEnv.staticEnv -> unit
! val ppFunctor : PrettyPrint.stream
-> Modules.Functor * StaticEnv.staticEnv * int -> unit
! val ppFunsig : PrettyPrint.stream
-> Modules.fctSig * StaticEnv.staticEnv * int -> unit
! val ppBinding: PrettyPrint.stream
-> Symbol.symbol * Bindings.binding * StaticEnv.staticEnv * int
-> unit
! val ppEnv : PrettyPrint.stream
-> StaticEnv.staticEnv * StaticEnv.staticEnv * int *
Symbol.symbol list option
--- 7,26 ----
signature PPMOD =
sig
! val ppSignature: PrettyPrintNew.stream
-> Modules.Signature * StaticEnv.staticEnv * int -> unit
! val ppStructure: PrettyPrintNew.stream
-> Modules.Structure * StaticEnv.staticEnv * int -> unit
! val ppOpen: PrettyPrintNew.stream
-> SymPath.path * Modules.Structure * StaticEnv.staticEnv * int -> unit
! val ppStructureName : PrettyPrintNew.stream
-> Modules.Structure * StaticEnv.staticEnv -> unit
! val ppFunctor : PrettyPrintNew.stream
-> Modules.Functor * StaticEnv.staticEnv * int -> unit
! val ppFunsig : PrettyPrintNew.stream
-> Modules.fctSig * StaticEnv.staticEnv * int -> unit
! val ppBinding: PrettyPrintNew.stream
-> Symbol.symbol * Bindings.binding * StaticEnv.staticEnv * int
-> unit
! val ppEnv : PrettyPrintNew.stream
-> StaticEnv.staticEnv * StaticEnv.staticEnv * int *
Symbol.symbol list option
***************
*** 30,41 ****
val ppElements : (StaticEnv.staticEnv * int * Modules.entityEnv option)
! -> PrettyPrint.stream
-> Modules.elements -> unit
! val ppEntity : PrettyPrint.stream
-> Modules.entity * StaticEnv.staticEnv * int
-> unit
! val ppEntityEnv : PrettyPrint.stream
-> Modules.entityEnv * StaticEnv.staticEnv * int
-> unit
--- 30,41 ----
val ppElements : (StaticEnv.staticEnv * int * Modules.entityEnv option)
! -> PrettyPrintNew.stream
-> Modules.elements -> unit
! val ppEntity : PrettyPrintNew.stream
-> Modules.entity * StaticEnv.staticEnv * int
-> unit
! val ppEntityEnv : PrettyPrintNew.stream
-> Modules.entityEnv * StaticEnv.staticEnv * int
-> unit
***************
*** 63,68 ****
structure LU = Lookup
! structure PP = PrettyPrint
! open PrettyPrint PPUtil
in
--- 63,69 ----
structure LU = Lookup
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
! open PrettyPrintNew PPUtilNew
in
***************
*** 191,195 ****
pps " as ";
ppSequence ppstrm
! {sep=C PrettyPrint.break{nsp=1,offset=0},
pr=(fn ppstrm => fn{variant,...} =>ppV(variant,env)),
style=CONSISTENT}
--- 192,196 ----
pps " as ";
ppSequence ppstrm
! {sep=C PrettyPrintNew.break{nsp=1,offset=0},
pr=(fn ppstrm => fn{variant,...} =>ppV(variant,env)),
style=CONSISTENT}
***************
*** 220,224 ****
fun ppStructure ppstrm (str,env,depth) =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
in case str
of M.STR { sign, rlzn as { entities, ... }, prim, ... } =>
--- 221,225 ----
fun ppStructure ppstrm (str,env,depth) =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
in case str
of M.STR { sign, rlzn as { entities, ... }, prim, ... } =>
***************
*** 360,364 ****
and ppSignature0 ppstrm (sign,env,depth,entityEnvOp) =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
val env = SE.atop(case entityEnvOp
of NONE => sigToEnv sign
--- 361,365 ----
and ppSignature0 ppstrm (sign,env,depth,entityEnvOp) =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
val env = SE.atop(case entityEnvOp
of NONE => sigToEnv sign
***************
*** 441,445 ****
and ppFunsig ppstrm (sign,env,depth) =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
fun trueBodySig (orig as M.SIG { elements =
[(sym, M.STRspec { sign, ... })],
--- 442,446 ----
and ppFunsig ppstrm (sign,env,depth) =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
fun trueBodySig (orig as M.SIG { elements =
[(sym, M.STRspec { sign, ... })],
***************
*** 487,491 ****
and ppStrEntity ppstrm (e,env,depth) =
let val {stamp,entities,properties,rpath,stub} = e
! val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
in if depth <= 1
then pps "<structure entity>"
--- 488,492 ----
and ppStrEntity ppstrm (e,env,depth) =
let val {stamp,entities,properties,rpath,stub} = e
! val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
in if depth <= 1
then pps "<structure entity>"
***************
*** 513,517 ****
and ppFctEntity ppstrm (e, env, depth) =
let val {stamp,closure,properties,tycpath,rpath,stub} = e
! val {openHVBox,openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
in if depth <= 1
then pps "<functor entity>"
--- 514,518 ----
and ppFctEntity ppstrm (e, env, depth) =
let val {stamp,closure,properties,tycpath,rpath,stub} = e
! val {openHVBox,openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
in if depth <= 1
then pps "<functor entity>"
***************
*** 541,545 ****
and ppFunctor ppstrm =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
fun ppF (M.FCT { sign, rlzn, ... }, env, depth) =
if depth <= 1
--- 542,546 ----
and ppFunctor ppstrm =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
fun ppF (M.FCT { sign, rlzn, ... }, env, depth) =
if depth <= 1
***************
*** 559,563 ****
and ppTycBind ppstrm (tyc,env) =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
fun visibleDcons(tyc,dcons) =
let fun checkCON(V.CON c) = c
--- 560,564 ----
and ppTycBind ppstrm (tyc,env) =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
fun visibleDcons(tyc,dcons) =
let fun checkCON(V.CON c) = c
***************
*** 676,680 ****
and ppReplBind ppstrm
(T.DEFtyc{tyfun=T.TYFUN{body=T.CONty(rightTyc,_),...},path,...},env) =
! let val {openHVBox, openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
in openHOVBox 2;
pps "datatype"; break{nsp=1,offset=0};
--- 677,681 ----
and ppReplBind ppstrm
(T.DEFtyc{tyfun=T.TYFUN{body=T.CONty(rightTyc,_),...},path,...},env) =
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
in openHOVBox 2;
pps "datatype"; break{nsp=1,offset=0};
***************
*** 699,703 ****
else (ppvseq ppstrm 2 ""
(fn ppstrm => fn (entVar,entity) =>
! let val {openHVBox,openHOVBox,closeBox,pps,break,newline} =
en_pp ppstrm
in openHVBox 2;
--- 700,704 ----
else (ppvseq ppstrm 2 ""
(fn ppstrm => fn (entVar,entity) =>
! let val {openHVBox,openHOVBox,closeBox,pps,ppi,break,newline} =
en_pp ppstrm
in openHVBox 2;
***************
*** 858,862 ****
| B.TYCbind tycon => ppTycBind ppstrm (tycon,env)
| B.SIGbind sign =>
! let val {openHVBox,openHOVBox,closeBox,pps,break,...} = en_pp ppstrm
in openHVBox 0;
pps "signature "; ppSym ppstrm name; pps " =";
--- 859,863 ----
| B.TYCbind tycon => ppTycBind ppstrm (tycon,env)
| B.SIGbind sign =>
! let val {openHVBox,openHOVBox,closeBox,pps,ppi,break,...} = en_pp ppstrm
in openHVBox 0;
pps "signature "; ppSym ppstrm name; pps " =";
***************
*** 873,877 ****
end
| B.STRbind str =>
! let val {openHVBox, openHOVBox,closeBox,pps,break,...} = en_pp ppstrm
in openHVBox 0;
pps "structure "; ppSym ppstrm name; pps " :";
--- 874,878 ----
end
| B.STRbind str =>
! let val {openHVBox, openHOVBox,closeBox,pps,ppi,break,...} = en_pp ppstrm
in openHVBox 0;
pps "structure "; ppSym ppstrm name; pps " :";
***************
*** 915,919 ****
fun ppOpen ppstrm (path,str,env,depth) =
! let val {openHVBox,openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
in openHVBox 0;
openHVBox 2;
--- 916,920 ----
fun ppOpen ppstrm (path,str,env,depth) =
! let val {openHVBox,openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
in openHVBox 0;
openHVBox 2;
Index: ppprim.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/Attic/ppprim.sml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ppprim.sml 6 Aug 2006 06:05:09 -0000 1.1.2.2
--- ppprim.sml 28 Aug 2006 05:12:10 -0000 1.1.2.3
***************
*** 3,17 ****
local
! structure PP = PrettyPrint
! open PPUtil
in
fun ppPrim ppstrm prim =
! let val {pps, ...} = en_pp ppstrm
! in (case prim of
! PrimOpId.NonPrim => pps "<NonPrim>"
! | PrimOpId.Prim(name) => (pps "<PrimE ";
! pps name;
! pps ">"))
end (* function ppPrim *)
--- 3,17 ----
local
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
! open PPUtilNew
in
fun ppPrim ppstrm prim =
! let val pps = PU.pps ppstrm
! in (case prim
! of PrimOpId.NonPrim => pps "<NonPrim>"
! | PrimOpId.Prim(name) =>
! (pps "<PrimE "; pps name; pps ">"))
end (* function ppPrim *)
***************
*** 22,38 ****
in
ppSequence ppstrm
! {sep = fn ppstrm => (PP.string ppstrm ", ";
! PP.break ppstrm {nsp=1, offset=0}),
! pr = (fn _ => fn elem =>
! (openHOVBox 1;
! pps "(";
! ppStrPrimElem ppstrm;
! pps ")";
! closeBox())),
! style = INCONSISTENT
! }
! strPrimInfo
end (* function ppStrPrimInfo *)
end (* local *)
! end
--- 22,38 ----
in
ppSequence ppstrm
! {sep = fn ppstrm => (PP.string ppstrm ", ";
! PP.break ppstrm {nsp=1, offset=0}),
! pr = (fn _ => fn elem =>
! (openHOVBox 1;
! pps "(";
! ppStrPrimElem ppstrm;
! pps ")";
! closeBox())),
! style = INCONSISTENT}
! strPrimInfo
end (* function ppStrPrimInfo *)
+
end (* local *)
! end (* structure PPPrim *)
Index: pptype.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/pptype.sml,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -C2 -d -r1.4 -r1.4.10.1
*** pptype.sml 13 Aug 2003 18:04:07 -0000 1.4
--- pptype.sml 28 Aug 2006 05:12:10 -0000 1.4.10.1
***************
*** 9,25 ****
val typeFormals : int -> string list
val tyvarPrintname : Types.tyvar -> string
! val ppTycon : StaticEnv.staticEnv -> PrettyPrint.stream
-> Types.tycon -> unit
! val ppTyfun : StaticEnv.staticEnv -> PrettyPrint.stream
-> Types.tyfun -> unit
! val ppType : StaticEnv.staticEnv -> PrettyPrint.stream
-> Types.ty -> unit
val ppDconDomain : (Types.dtmember vector * Types.tycon list)
-> StaticEnv.staticEnv
! -> PrettyPrint.stream -> Types.ty -> unit
! val ppDataconTypes : StaticEnv.staticEnv -> PrettyPrint.stream
-> Types.tycon -> unit
val resetPPType : unit -> unit
! val ppFormals : PrettyPrint.stream -> int -> unit
val debugging : bool ref
--- 9,25 ----
val typeFormals : int -> string list
val tyvarPrintname : Types.tyvar -> string
! val ppTycon : StaticEnv.staticEnv -> PrettyPrintNew.stream
-> Types.tycon -> unit
! val ppTyfun : StaticEnv.staticEnv -> PrettyPrintNew.stream
-> Types.tyfun -> unit
! val ppType : StaticEnv.staticEnv -> PrettyPrintNew.stream
-> Types.ty -> unit
val ppDconDomain : (Types.dtmember vector * Types.tycon list)
-> StaticEnv.staticEnv
! -> PrettyPrintNew.stream -> Types.ty -> unit
! val ppDataconTypes : StaticEnv.staticEnv -> PrettyPrintNew.stream
-> Types.tycon -> unit
val resetPPType : unit -> unit
! val ppFormals : PrettyPrintNew.stream -> int -> unit
val debugging : bool ref
***************
*** 37,42 ****
structure T = Types
structure TU = TypesUtil
! structure PP = PrettyPrint
! open Types PPUtil
in
--- 37,43 ----
structure T = Types
structure TU = TypesUtil
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
! open Types PPUtilNew
in
***************
*** 274,278 ****
and ppType1 env ppstrm (ty: ty, sign: T.polysign,
membersOp: (T.dtmember vector * T.tycon list) option) : unit =
! let val {openHVBox,openHOVBox,closeBox,pps,break,newline} = en_pp ppstrm
fun prty ty =
case ty
--- 275,279 ----
and ppType1 env ppstrm (ty: ty, sign: T.polysign,
membersOp: (T.dtmember vector * T.tycon list) option) : unit =
! let val {openHVBox,openHOVBox,closeBox,pps,ppi,break,newline} = en_pp ppstrm
fun prty ty =
case ty
Index: ppval.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppval.sml,v
retrieving revision 1.3.10.3
retrieving revision 1.3.10.4
diff -C2 -d -r1.3.10.3 -r1.3.10.4
*** ppval.sml 10 Jul 2006 14:06:37 -0000 1.3.10.3
--- ppval.sml 28 Aug 2006 05:12:10 -0000 1.3.10.4
***************
*** 7,18 ****
signature PPVAL =
sig
! val ppAccess: PrettyPrint.stream -> Access.access -> unit
! val ppRep: PrettyPrint.stream -> Access.conrep -> unit
! val ppDcon: PrettyPrint.stream -> VarCon.datacon -> unit
! val ppVar: PrettyPrint.stream -> VarCon.var -> unit
! val ppDebugDcon : PrettyPrint.stream
-> StaticEnv.staticEnv -> VarCon.datacon -> unit
val ppDebugVar: (PrimOpId.primId -> string) ->
! PrettyPrint.stream
-> StaticEnv.staticEnv -> VarCon.var -> unit
end (* signature PPVAL *)
--- 7,18 ----
signature PPVAL =
sig
! val ppAccess: PrettyPrintNew.stream -> Access.access -> unit
! val ppRep: PrettyPrintNew.stream -> Access.conrep -> unit
! val ppDcon: PrettyPrintNew.stream -> VarCon.datacon -> unit
! val ppVar: PrettyPrintNew.stream -> VarCon.var -> unit
! val ppDebugDcon : PrettyPrintNew.stream
-> StaticEnv.staticEnv -> VarCon.datacon -> unit
val ppDebugVar: (PrimOpId.primId -> string) ->
! PrettyPrintNew.stream
-> StaticEnv.staticEnv -> VarCon.var -> unit
end (* signature PPVAL *)
***************
*** 21,29 ****
struct
! local structure PP = PrettyPrint
! structure TU = TypesUtil
! structure LU = Lookup
! structure A = Access
! open PrettyPrint PPUtil VarCon Types
in
--- 21,31 ----
struct
! local
! structure PP = PrettyPrintNew
! structure PU = PPUtilNew
! structure TU = TypesUtil
! structure LU = Lookup
! structure A = Access
! open PrettyPrintNew PPUtilNew VarCon Types
in
-------------------------------------------------------------------------
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