CVS: sml-dist/src/cm/tools/main public-tools.sig,1.4,1.5 tools-fn.sml,1.5,1.6

Update of /cvsroot/smlnj/sml-dist/src/cm/tools/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30700/src/cm/tools/main

Modified Files:
	public-tools.sig tools-fn.sml 
Log Message:
ml-flex -> lexgen

Index: public-tools.sig
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/tools/main/public-tools.sig,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** public-tools.sig	24 Feb 2006 22:23:53 -0000	1.4
--- public-tools.sig	1 Mar 2006 04:44:26 -0000	1.5
***************
*** 26,30 ****
  				    class: string,
  				    suffixes: string list,
! 				    cmdStdPath: unit -> string,
  				    extensionStyle: extensionStyle,
  				    template: string option,
--- 26,30 ----
  				    class: string,
  				    suffixes: string list,
! 				    cmdStdPath: unit -> string * string list,
  				    extensionStyle: extensionStyle,
  				    template: string option,

Index: tools-fn.sml
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/cm/tools/main/tools-fn.sml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tools-fn.sml	24 Feb 2006 22:23:53 -0000	1.5
--- tools-fn.sml	1 Mar 2006 04:44:27 -0000	1.6
***************
*** 26,30 ****
  	val { tool, class, suffixes, cmdStdPath,
  	      extensionStyle, template, dflopts } = args
! 	val template = getOpt (template, "%c %s")
  	fun err m = raise ToolError { tool = tool, msg = m }
  	fun rule { spec, context, native2pathmaker, defaultClassOf, sysinfo } = let
--- 26,30 ----
  	val { tool, class, suffixes, cmdStdPath,
  	      extensionStyle, template, dflopts } = args
! 	val template = getOpt (template, "%c %u %s")
  	fun err m = raise ToolError { tool = tool, msg = m }
  	fun rule { spec, context, native2pathmaker, defaultClassOf, sysinfo } = let
***************
*** 50,62 ****
  		     tfiles)
  	    fun runcmd () = let
! 		val cmdname = mkCmdName (cmdStdPath ())
  		val cmd =
  		    Subst.substitute
  			[{ prefix = "%",
! 			   substitutions = [Subst.subfor "%c" cmdname,
! 					    Subst.subfor "%s" nativename,
! 					    Subst.subfor "%%" "%",
! 					    Subst.subnsel (1, #"o", fn x => x, " ") sol,
! 					    Subst.subnsel (1, #"t", #1, " ") tfiles] }]
  			template
  	    in
--- 50,66 ----
  		     tfiles)
  	    fun runcmd () = let
! 		val (csp, shelloptions) = cmdStdPath ()
! 		val cmdname = mkCmdName csp
  		val cmd =
  		    Subst.substitute
  			[{ prefix = "%",
! 			   substitutions =
! 			     [Subst.subfor "%c" cmdname,
! 			      Subst.subfor "%s" nativename,
! 			      Subst.subfor "%%" "%",
! 			      Subst.subnsel (1, #"o", fn x => x, " ") sol,
! 			      Subst.subnsel (1, #"t", #1, " ") tfiles,
! 			      Subst.subnsel (1, #"u", fn x => x, " ")
! 					    shelloptions] }]
  			template
  	    in



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642