CVS: sml-dist/src/compiler/Elaborator/elaborate elabdebug.sml, 1.3, 1.3.10.1 elabtop.sml, 1.3.10.1, 1.3.10.2

Update of /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26302/src/compiler/Elaborator/elaborate

Modified Files:
      Tag: primop-branch-2
	elabdebug.sml elabtop.sml 
Log Message:
switched all pretty printing to use PrettyPrintNew

Index: elabdebug.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabdebug.sml,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -C2 -d -r1.3 -r1.3.10.1
*** elabdebug.sml	13 Aug 2003 18:04:06 -0000	1.3
--- elabdebug.sml	28 Aug 2006 05:12:10 -0000	1.3.10.1
***************
*** 6,13 ****
    val debugPrint : bool ref 
                     -> (string *
! 		       (PrettyPrint.stream -> 'a -> unit) *
  		       'a)
                     -> unit
!   val ppSymList : PrettyPrint.stream -> Symbol.symbol list -> unit
    val envSymbols : StaticEnv.staticEnv -> Symbol.symbol list
    val checkEnv : StaticEnv.staticEnv * Symbol.symbol -> string
--- 6,13 ----
    val debugPrint : bool ref 
                     -> (string *
! 		       (PrettyPrintNew.stream -> 'a -> unit) *
  		       'a)
                     -> unit
!   val ppSymList : PrettyPrintNew.stream -> Symbol.symbol list -> unit
    val envSymbols : StaticEnv.staticEnv -> Symbol.symbol list
    val checkEnv : StaticEnv.staticEnv * Symbol.symbol -> string
***************
*** 20,30 ****
  struct
  
! local structure S  = Symbol
!       structure SE = StaticEnv
!       structure PP = PrettyPrint
!       structure PPU = PPUtil
!       structure EM = ErrorMsg
  
!       open PP
  
  in 
--- 20,31 ----
  struct
  
! local
!   structure S  = Symbol
!   structure SE = StaticEnv
!   structure PP = PrettyPrintNew
!   structure PU = PPUtilNew
!   structure EM = ErrorMsg
  
!   open PP
  
  in 
***************
*** 33,37 ****
                 (msg: string, printfn: PP.stream -> 'a -> unit, arg: 'a) =
    if (!debugging) then
!        with_pp (EM.defaultConsumer())
  	(fn ppstrm =>
  	  (openHVBox ppstrm (PP.Rel 0);
--- 34,38 ----
                 (msg: string, printfn: PP.stream -> 'a -> unit, arg: 'a) =
    if (!debugging) then
!        with_default_pp
  	(fn ppstrm =>
  	  (openHVBox ppstrm (PP.Rel 0);
***************
*** 48,57 ****
  
  fun ppSymList ppstrm (syms: S.symbol list) = 
!      PPU.ppClosedSequence ppstrm
       {front=(fn ppstrm => PP.string ppstrm "["),
        sep=(fn ppstrm => (PP.string ppstrm ",")),
        back=(fn ppstrm => PP.string ppstrm "]"),
!       style=PPU.INCONSISTENT,
!       pr=PPU.ppSym}
       syms
  
--- 49,58 ----
  
  fun ppSymList ppstrm (syms: S.symbol list) = 
!      PU.ppClosedSequence ppstrm
       {front=(fn ppstrm => PP.string ppstrm "["),
        sep=(fn ppstrm => (PP.string ppstrm ",")),
        back=(fn ppstrm => PP.string ppstrm "]"),
!       style=PU.INCONSISTENT,
!       pr=PU.ppSym}
       syms
  

Index: elabtop.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/elaborate/elabtop.sml,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -C2 -d -r1.3.10.1 -r1.3.10.2
*** elabtop.sml	18 Jul 2006 19:46:35 -0000	1.3.10.1
--- elabtop.sml	28 Aug 2006 05:12:10 -0000	1.3.10.2
***************
*** 16,20 ****
  struct
  
! local structure PP = PrettyPrint
        structure S = Symbol
        structure SP = SymPath
--- 16,21 ----
  struct
  
! local structure PP = PrettyPrintNew
!       structure PU = PPUtilNew
        structure S = Symbol
        structure SP = SymPath
***************
*** 136,142 ****
        let val _ = debugPrint("top level open: ",
                      (fn pps => fn paths =>
!                        PPUtil.ppSequence pps
                           {sep=(fn pps => PP.string pps ","),
!                           pr=PPUtil.ppSymPath, style=PPUtil.INCONSISTENT}
                         (List.map SymPath.SPATH paths)), paths)
  
--- 137,143 ----
        let val _ = debugPrint("top level open: ",
                      (fn pps => fn paths =>
!                        PU.ppSequence pps
                           {sep=(fn pps => PP.string pps ","),
!                           pr=PU.ppSymPath, style=PU.INCONSISTENT}
                         (List.map SymPath.SPATH paths)), paths)
  


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