CVS: sml-dist/src/cm/parse parse.sml, 1.74, 1.74.4.1

David MacQueen <[email protected]> Sun, 27 Aug 2006 22:12:12 -0700
Newsgroups gmane.comp.lang.sml.smlnj.commits
Message-ID <[email protected]>
Update of /cvsroot/smlnj/sml-dist/src/cm/parse
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26302/src/cm/parse

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

Index: parse.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/parse/parse.sml,v
retrieving revision 1.74
retrieving revision 1.74.4.1
diff -C2 -d -r1.74 -r1.74.4.1
*** parse.sml	18 Oct 2004 21:45:24 -0000	1.74
--- parse.sml	28 Aug 2006 05:12:10 -0000	1.74.4.1
***************
*** 30,33 ****
--- 30,34 ----
      val lookAhead = 30
  
+     structure PP = PrettyPrintNew
      structure S = Source
      structure EM = ErrorMsg
***************
*** 35,39 ****
      structure GG = GroupGraph
      structure DG = DependencyGraph
! 
      structure CMLrVals = CMLrValsFun (structure Token = LrParser.Token)
      structure CMLex = CMLexFun (structure Tokens = CMLrVals.Tokens)
--- 36,40 ----
      structure GG = GroupGraph
      structure DG = DependencyGraph
!     
      structure CMLrVals = CMLrValsFun (structure Token = LrParser.Token)
      structure CMLex = CMLexFun (structure Tokens = CMLrVals.Tokens)
***************
*** 177,184 ****
  			    val s = EM.matchErrorString s (p1, p2)
  			in
! 			    PrettyPrint.newline pps;
! 			    PrettyPrint.string pps s;
! 			    PrettyPrint.string pps ": importing ";
! 			    PrettyPrint.string pps (SrcPath.descr g0);
  			    loop (g, t)
  			end
--- 178,185 ----
  			    val s = EM.matchErrorString s (p1, p2)
  			in
! 			    PP.newline pps;
! 			    PP.string pps s;
! 			    PP.string pps ": importing ";
! 			    PP.string pps (SrcPath.descr g0);
  			    loop (g, t)
  			end
***************
*** 214,219 ****
  			fun loop [] = ()
  			  | loop (h :: t) =
! 			    (PrettyPrint.newline pps;
! 			     PrettyPrint.string pps (SrcPath.descr h);
  			     loop t)
  		    in
--- 215,220 ----
  			fun loop [] = ()
  			  | loop (h :: t) =
! 			    (PP.newline pps;
! 			     PP.string pps (SrcPath.descr h);
  			     loop t)
  		    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