Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/trunk/src/cm/tools/main/private-tools.sml
ViewVC logotype

Diff of /sml/trunk/src/cm/tools/main/private-tools.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 818, Fri May 4 20:58:47 2001 UTC revision 873, Mon Jul 9 15:26:20 2001 UTC
# Line 57  Line 57 
57      type rule = { spec: spec,      type rule = { spec: spec,
58                    native2pathmaker: string -> pathmaker,                    native2pathmaker: string -> pathmaker,
59                    context: rulecontext,                    context: rulecontext,
60                    defaultClassOf: fnspec -> class option } ->                    defaultClassOf: fnspec -> class option,
61                      sysinfo: { symval: string -> int option,
62                                 archos: string } } ->
63                  partial_expansion                  partial_expansion
64    
65      type gcarg = { name: string, mkfname: unit -> string }      type gcarg = { name: string, mkfname: unit -> string }
# Line 266  Line 268 
268          loop (options, StringMap.empty, [])          loop (options, StringMap.empty, [])
269      end      end
270    
271      fun smlrule { spec, context, native2pathmaker, defaultClassOf } = let      fun smlrule { spec, context, native2pathmaker, defaultClassOf, sysinfo } = let
272          val { name, mkpath, opts = oto, derived, ... } : spec = spec          val { name, mkpath, opts = oto, derived, ... } : spec = spec
273          val tool = "sml"          val tool = "sml"
274          fun err s = raise ToolError { tool = tool, msg = s }          fun err s = raise ToolError { tool = tool, msg = s }
# Line 338  Line 340 
340             cmfiles = [] },             cmfiles = [] },
341           [])           [])
342      end      end
343      fun cmrule { spec, context, native2pathmaker, defaultClassOf } = let      fun cmrule { spec, context, native2pathmaker, defaultClassOf, sysinfo } = let
344          val { name, mkpath, opts = oto, derived, ... } : spec = spec          val { name, mkpath, opts = oto, derived, ... } : spec = spec
345          fun err m = raise ToolError { tool = "cm", msg = m }          fun err m = raise ToolError { tool = "cm", msg = m }
346          fun proc_opts (rb, vrq, []) = (rb, vrq)          fun proc_opts (rb, vrq, []) = (rb, vrq)
# Line 376  Line 378 
378           [])           [])
379      end      end
380    
381      fun expand { error, local_registry = lr, spec, context, load_plugin } = let      fun expand { error, local_registry = lr, spec, context, load_plugin, sysinfo } = let
382          val dummy = ({ smlfiles = [], cmfiles = [], sources = [] }, [])          val dummy = ({ smlfiles = [], cmfiles = [], sources = [] }, [])
383          fun norule _ = dummy          fun norule _ = dummy
384          fun native2pathmaker s () =          fun native2pathmaker s () =
# Line 422  Line 424 
424          in          in
425              rule { spec = spec, context = rcontext,              rule { spec = spec, context = rcontext,
426                     native2pathmaker = native2pathmaker,                     native2pathmaker = native2pathmaker,
427                     defaultClassOf = defaultClassOf (load_plugin context) }                     defaultClassOf = defaultClassOf (load_plugin context),
428                       sysinfo = sysinfo }
429              handle ToolError { tool, msg } =>              handle ToolError { tool, msg } =>
430                     (error (concat ["tool \"", tool, "\" failed: ", msg]);                     (error (concat ["tool \"", tool, "\" failed: ", msg]);
431                      dummy)                      dummy)

Legend:
Removed from v.818  
changed lines
  Added in v.873

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0