CVS: sml-dist/src/compiler/Basics/errormsg errormsg.sig, 1.3, 1.3.10.1 errormsg.sml, 1.3, 1.3.10.1

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

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

Index: errormsg.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Basics/errormsg/errormsg.sig,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -C2 -d -r1.3 -r1.3.10.1
*** errormsg.sig	13 Aug 2003 18:04:05 -0000	1.3
--- errormsg.sig	28 Aug 2006 05:12:10 -0000	1.3.10.1
***************
*** 4,8 ****
   sig
      datatype severity = WARN | COMPLAIN
!     type complainer (*  = severity -> string -> (PrettyPrint.stream -> unit)
                            -> unit *)
      type errorFn = SourceMap.region -> complainer
--- 4,8 ----
   sig
      datatype severity = WARN | COMPLAIN
!     type complainer (*  = severity -> string -> (PrettyPrintNew.stream -> unit)
                            -> unit *)
      type errorFn = SourceMap.region -> complainer
***************
*** 12,30 ****
      val anyErrors : errors -> bool
      exception Error
!     val defaultConsumer : unit -> PrettyPrint.device
!     val nullErrorBody : PrettyPrint.stream -> unit
      val error : Source.inputSource -> SourceMap.region -> complainer
      (* with a known location string but without access to the actual source: *)
      val errorNoSource :
! 	PrettyPrint.device * bool ref -> string -> complainer
!     val errorNoFile : PrettyPrint.device * bool ref -> SourceMap.region
                        -> complainer
  
      val matchErrorString : Source.inputSource -> SourceMap.region -> string
      val errors : Source.inputSource -> errors
!     val errorsNoFile : PrettyPrint.device * bool ref -> errors
  
      val impossible : string -> 'a
!     val impossibleWithBody : string -> (PrettyPrint.stream -> unit) -> 'a
   end
  
--- 12,30 ----
      val anyErrors : errors -> bool
      exception Error
!     val defaultConsumer : unit -> PrettyPrintNew.device
!     val nullErrorBody : PrettyPrintNew.stream -> unit
      val error : Source.inputSource -> SourceMap.region -> complainer
      (* with a known location string but without access to the actual source: *)
      val errorNoSource :
! 	PrettyPrintNew.device * bool ref -> string -> complainer
!     val errorNoFile : PrettyPrintNew.device * bool ref -> SourceMap.region
                        -> complainer
  
      val matchErrorString : Source.inputSource -> SourceMap.region -> string
      val errors : Source.inputSource -> errors
!     val errorsNoFile : PrettyPrintNew.device * bool ref -> errors
  
      val impossible : string -> 'a
!     val impossibleWithBody : string -> (PrettyPrintNew.stream -> unit) -> 'a
   end
  

Index: errormsg.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/compiler/Basics/errormsg/errormsg.sml,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -C2 -d -r1.3 -r1.3.10.1
*** errormsg.sml	13 Aug 2003 18:04:06 -0000	1.3
--- errormsg.sml	28 Aug 2006 05:12:10 -0000	1.3.10.1
***************
*** 5,10 ****
  struct
  
!   structure PP = PrettyPrint
!   open PrettyPrint SourceMap
  
   (* error reporting *)
--- 5,10 ----
  struct
  
!   structure PP = PrettyPrintNew
!   open PP SourceMap
  
   (* error reporting *)
***************
*** 22,33 ****
                   anyErrors: bool ref}
  
!   fun defaultConsumer () =
!       {consumer = Control_Print.say,
!        linewidth = !Control_Print.linewidth,
!        flush = Control_Print.flush}
  
    val nullErrorBody = (fn (ppstrm: PP.stream) => ())
  
!   fun ppmsg(errConsumer,location,severity,msg,body) =
        case (!BasicControl.printWarnings, severity)
  	of (false,WARN) => ()
--- 22,30 ----
                   anyErrors: bool ref}
  
!   fun defaultConsumer () = PP.defaultDevice
  
    val nullErrorBody = (fn (ppstrm: PP.stream) => ())
  
!   fun ppmsg(errConsumer: PP.device, location, severity, msg, body) =
        case (!BasicControl.printWarnings, severity)
  	of (false,WARN) => ()


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