tuned signature;
authorwenzelm
Tue Mar 13 18:40:25 2018 +0100 (14 months ago)
changeset 67847c61acb4855b6
parent 67846 bdf6933f7ac9
child 67848 dd83610333de
tuned signature;
src/Pure/System/options.scala
src/Pure/Tools/build.scala
     1.1 --- a/src/Pure/System/options.scala	Tue Mar 13 18:28:12 2018 +0100
     1.2 +++ b/src/Pure/System/options.scala	Tue Mar 13 18:40:25 2018 +0100
     1.3 @@ -130,14 +130,14 @@
     1.4    def read_prefs(file: Path = PREFS): String =
     1.5      if (file.is_file) File.read(file) else ""
     1.6  
     1.7 -  def init(prefs: String = read_prefs(PREFS)): Options =
     1.8 +  def init(prefs: String = read_prefs(PREFS), opts: List[String] = Nil): Options =
     1.9    {
    1.10      var options = empty
    1.11      for {
    1.12        dir <- Isabelle_System.components()
    1.13        file = dir + OPTIONS if file.is_file
    1.14      } { options = Parser.parse_file(options, file.implode, File.read(file)) }
    1.15 -    Options.Parser.parse_prefs(options, prefs)
    1.16 +    (Options.Parser.parse_prefs(options, prefs) /: opts)(_ + _)
    1.17    }
    1.18  
    1.19  
     2.1 --- a/src/Pure/Tools/build.scala	Tue Mar 13 18:28:12 2018 +0100
     2.2 +++ b/src/Pure/Tools/build.scala	Tue Mar 13 18:40:25 2018 +0100
     2.3 @@ -699,7 +699,7 @@
     2.4      var check_keywords: Set[String] = Set.empty
     2.5      var list_files = false
     2.6      var no_build = false
     2.7 -    var options = (Options.init() /: build_options)(_ + _)
     2.8 +    var options = Options.init(opts = build_options)
     2.9      var system_mode = false
    2.10      var verbose = false
    2.11      var exclude_sessions: List[String] = Nil