CVS: sml-dist/src/compiler/Elaborator/print ppmod.sml, 1.3.10.4, 1.3.10.5 ppprim.sml, 1.1.2.1, 1.1.2.2

George Kuan <[email protected]> Sat, 05 Aug 2006 23:05:11 -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-serv30252/src/compiler/Elaborator/print

Modified Files:
      Tag: primop-branch-2
	ppmod.sml ppprim.sml 
Log Message:
hooked up PPPrim and turned off some debugging printouts

Index: ppmod.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/ppmod.sml,v
retrieving revision 1.3.10.4
retrieving revision 1.3.10.5
diff -C2 -d -r1.3.10.4 -r1.3.10.5
*** ppmod.sml	24 Jul 2006 23:10:26 -0000	1.3.10.4
--- ppmod.sml	6 Aug 2006 06:05:08 -0000	1.3.10.5
***************
*** 240,245 ****
  			(* GK: This should be cleaned up soon so as to use a 
  			   ppStrInfo that is an actual pretty printer conforming
! 			   to the pattern of the other pretty printers. *)
! 			PrimOpId.ppStrInfo prim;
  		       closeBox();
  		      closeBox())
--- 240,246 ----
  			(* GK: This should be cleaned up soon so as to use a 
  			   ppStrInfo that is an actual pretty printer conforming
! 			   to the pattern of the other pretty printers. 
! 			PrimOpId.ppStrInfo prim; *)
! 			PPPrim.ppStrPrimInfo ppstrm prim;
  		       closeBox();
  		      closeBox())

Index: ppprim.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Elaborator/print/Attic/ppprim.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
*** ppprim.sml	31 Jul 2006 23:29:45 -0000	1.1.2.1
--- ppprim.sml	6 Aug 2006 06:05:09 -0000	1.1.2.2
***************
*** 3,11 ****
  
  local 
!     open PPUtilNew 
  in
  
  fun ppPrim ppstrm prim =
!     let val {pps, ...} = ppstrm
      in (case prim of 
  	    PrimOpId.NonPrim => pps "<NonPrim>"
--- 3,12 ----
  
  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>"
***************
*** 16,22 ****
  
  fun ppStrPrimInfo ppstrm strPrimInfo =
!     let val {openHOVBox, pps, ...} = ppstrm
! 	fun ppStrPrimElem ppstrm (PrimE p) = ppPrim ppstrm p
! 	  | ppStrPrimElem ppstrm (StrE ps) = ppStrPrimInfo ppstrm ps
      in
  	ppSequence ppstrm 
--- 17,23 ----
  
  fun ppStrPrimInfo ppstrm strPrimInfo =
!     let val {openHOVBox, closeBox, pps, ...} = en_pp ppstrm
! 	fun ppStrPrimElem ppstrm (PrimOpId.PrimE p) = ppPrim ppstrm p
! 	  | ppStrPrimElem ppstrm (PrimOpId.StrE ps) = ppStrPrimInfo ppstrm ps
      in
  	ppSequence ppstrm 
***************
*** 26,32 ****
  				     (openHOVBox 1; 
  				      pps "(";
! 				      ppStrPrimElem ppstrm,
  				      pps ")";
! 				      closeBox()))
  		    style = INCONSISTENT
  		    }
--- 27,33 ----
  				     (openHOVBox 1; 
  				      pps "(";
! 				      ppStrPrimElem ppstrm;
  				      pps ")";
! 				      closeBox())),
  		    style = INCONSISTENT
  		    }


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV