CVS: sml-dist/src/system/Basis/Implementation/NJ internals.sig,1.12,1.13 internals.sml,1.11,1.12

Update of /cvsroot/smlnj/sml-dist/src/system/Basis/Implementation/NJ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14854/src/system/Basis/Implementation/NJ

Modified Files:
	internals.sig internals.sml 
Log Message:
fixed problem with bogus exn message when using btrace

Index: internals.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/system/Basis/Implementation/NJ/internals.sig,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** internals.sig	15 Oct 2004 20:45:02 -0000	1.12
--- internals.sig	16 Nov 2005 16:21:43 -0000	1.13
***************
*** 35,39 ****
  			register: int * int * int * string -> unit }
  
! 	type monitor = { name: string, monitor: (unit -> unit) -> unit }
  
  	val active_plugins : plugin list ref
--- 35,39 ----
  			register: int * int * int * string -> unit }
  
! 	type monitor = { name: string, monitor: bool * (unit -> unit) -> unit }
  
  	val active_plugins : plugin list ref
***************
*** 53,57 ****
  	val mode : bool ref
  
! 	val with_monitors : (unit -> unit) -> unit
      end
  end
--- 53,57 ----
  	val mode : bool ref
  
! 	val with_monitors : bool -> (unit -> unit) -> unit
      end
  end

Index: internals.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/system/Basis/Implementation/NJ/internals.sml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** internals.sml	15 Oct 2004 20:45:02 -0000	1.11
--- internals.sml	16 Nov 2005 16:21:43 -0000	1.12
***************
*** 23,27 ****
      structure TDP = struct
          type plugin = Core.tdp_plugin
! 	type monitor = { name: string, monitor: (unit -> unit) -> unit }
  
  	val active_plugins = Core.tdp_active_plugins
--- 23,27 ----
      structure TDP = struct
          type plugin = Core.tdp_plugin
! 	type monitor = { name: string, monitor: bool * (unit -> unit) -> unit }
  
  	val active_plugins = Core.tdp_active_plugins
***************
*** 38,44 ****
  	val mode = ref false
  
! 	fun with_monitors work =
  	    let fun loop [] = work ()
! 		  | loop ({ name, monitor } :: ms) = monitor (fn () => loop ms)
  	    in
  		loop (!active_monitors)
--- 38,45 ----
  	val mode = ref false
  
! 	fun with_monitors report_final_exn work =
  	    let fun loop [] = work ()
! 		  | loop ({ name, monitor } :: ms) =
! 		      monitor (report_final_exn, fn () => loop ms)
  	    in
  		loop (!active_monitors)



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click