CVS: sml-dist/src/compiler/Elaborator/print pputil-new.sig, 1.1.2.1, 1.1.2.2 pputil-new.sml, 1.1.2.1, 1.1.2.2

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

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

Index: pputil-new.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/Attic/pputil-new.sig,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** pputil-new.sig	1 Aug 2006 23:01:54 -0000	1.1.2.1
--- pputil-new.sig	11 Aug 2006 20:42:22 -0000	1.1.2.2
***************
*** 46,49 ****
--- 46,50 ----
  	       -> (PrettyPrintNew.stream -> 'a -> unit) -> 'a list -> unit
  
+   val pps: PrettyPrintNew.stream -> string -> unit
    val ppi: PrettyPrintNew.stream -> int -> unit
    val ppcomma : PrettyPrintNew.stream -> unit
***************
*** 59,63 ****
  	       openHOVBox : int -> unit,
  	       closeBox   : unit -> unit, 
! 	       pps        : string -> unit}
    val ppArray : PrettyPrintNew.stream -> 
                  (PrettyPrintNew.stream -> 'a -> unit) * 'a array
--- 60,65 ----
  	       openHOVBox : int -> unit,
  	       closeBox   : unit -> unit, 
! 	       pps        : string -> unit,
!                ppi        : int -> unit}
    val ppArray : PrettyPrintNew.stream -> 
                  (PrettyPrintNew.stream -> 'a -> unit) * 'a array

Index: pputil-new.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/Attic/pputil-new.sml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** pputil-new.sml	1 Aug 2006 23:01:55 -0000	1.1.2.1
--- pputil-new.sml	11 Aug 2006 20:42:22 -0000	1.1.2.2
***************
*** 12,15 ****
--- 12,22 ----
    val pps = PP.string
  
+   datatype break_style = CONSISTENT | INCONSISTENT
+ 
+   fun openStyleBox style = 
+       case style
+         of CONSISTENT => PP.openHVBox
+          | INCONSISTENT => PP.openHOVBox
+ 
    fun ppSequence0 ppstream (sep:PP.stream->unit,pr,elems) =
        let fun prElems [el] = pr ppstream el
***************
*** 17,20 ****
--- 24,28 ----
  	        (pr ppstream el;
  		 sep ppstream;
+                  PP.break ppstream {nsp=1,offset=0};
                   prElems rest)
  	    | prElems [] = ()
***************
*** 22,32 ****
        end
  
-   datatype break_style = CONSISTENT | INCONSISTENT
- 
-   fun openStyleBox style = 
-       case style
-         of CONSISTENT => PP.openHVBox
-          | INCONSISTENT => PP.openHOVBox
- 
    fun ppSequence ppstream {sep:PP.stream->unit, pr:PP.stream->'a->unit, 
                             style:break_style} (elems: 'a list) =
--- 30,33 ----
***************
*** 38,42 ****
                                  back:PP.stream->unit,pr:PP.stream->'a->unit,
                                  style:break_style} (elems:'a list) =
!       (PP.openHVBox ppstream (PP.Rel 0);
         front ppstream;
         openStyleBox style ppstream (PP.Rel 0);
--- 39,43 ----
                                  back:PP.stream->unit,pr:PP.stream->'a->unit,
                                  style:break_style} (elems:'a list) =
!       (PP.openHVBox ppstream (PP.Rel 1);
         front ppstream;
         openStyleBox style ppstream (PP.Rel 0);
***************
*** 182,186 ****
         openHOVBox = (fn indent => PP.openHOVBox ppstrm (PP.Rel indent)),  (* INCONSISTENT *)
         closeBox = fn () => PP.closeBox ppstrm,
!        pps = PP.string ppstrm,
         break = fn nsp_offset => PP.break ppstrm nsp_offset,
         newline = fn () => PP.newline ppstrm};
--- 183,188 ----
         openHOVBox = (fn indent => PP.openHOVBox ppstrm (PP.Rel indent)),  (* INCONSISTENT *)
         closeBox = fn () => PP.closeBox ppstrm,
!        pps = pps ppstrm,
!        ppi = ppi ppstrm,
         break = fn nsp_offset => PP.break ppstrm nsp_offset,
         newline = fn () => PP.newline ppstrm};
***************
*** 211,213 ****
  
  
! end (* structure PPUtil *)
--- 213,215 ----
  
  
! end (* structure PPUtilNew *)


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