tuned signature;
authorwenzelm
Sun Feb 28 17:40:01 2016 +0100 (2016-02-28)
changeset 6245438c89353b349
parent 62453 b93cc7d73431
child 62455 2026ef279d1e
tuned signature;
src/Pure/System/getopts.scala
src/Pure/System/options.scala
src/Pure/Tools/build_doc.scala
src/Pure/Tools/check_sources.scala
src/Pure/Tools/doc.scala
src/Pure/Tools/update_cartouches.scala
src/Pure/Tools/update_header.scala
src/Pure/Tools/update_then.scala
src/Pure/Tools/update_theorems.scala
     1.1 --- a/src/Pure/System/getopts.scala	Sun Feb 28 17:37:20 2016 +0100
     1.2 +++ b/src/Pure/System/getopts.scala	Sun Feb 28 17:40:01 2016 +0100
     1.3 @@ -9,7 +9,7 @@
     1.4  
     1.5  object Getopts
     1.6  {
     1.7 -  def apply(usage_text: () => String, option_specs: (String, String => Unit)*): Getopts =
     1.8 +  def apply(usage_text: String, option_specs: (String, String => Unit)*): Getopts =
     1.9    {
    1.10      val options =
    1.11        (Map.empty[Char, (Boolean, String => Unit)] /: option_specs) {
    1.12 @@ -25,11 +25,11 @@
    1.13    }
    1.14  }
    1.15  
    1.16 -class Getopts private(usage_text: () => String, options: Map[Char, (Boolean, String => Unit)])
    1.17 +class Getopts private(usage_text: String, options: Map[Char, (Boolean, String => Unit)])
    1.18  {
    1.19    def usage(): Nothing =
    1.20    {
    1.21 -    Console.println(usage_text())
    1.22 +    Console.println(usage_text)
    1.23      sys.exit(1)
    1.24    }
    1.25  
     2.1 --- a/src/Pure/System/options.scala	Sun Feb 28 17:37:20 2016 +0100
     2.2 +++ b/src/Pure/System/options.scala	Sun Feb 28 17:40:01 2016 +0100
     2.3 @@ -150,7 +150,7 @@
     2.4        var list_options = false
     2.5        var export_file = ""
     2.6  
     2.7 -      val getopts = Getopts(() => """
     2.8 +      val getopts = Getopts("""
     2.9  Usage: isabelle options [OPTIONS] [MORE_OPTIONS ...]
    2.10  
    2.11    Options are:
     3.1 --- a/src/Pure/Tools/build_doc.scala	Sun Feb 28 17:37:20 2016 +0100
     3.2 +++ b/src/Pure/Tools/build_doc.scala	Sun Feb 28 17:40:01 2016 +0100
     3.3 @@ -77,7 +77,7 @@
     3.4        var system_mode = false
     3.5  
     3.6        val getopts =
     3.7 -        Getopts(() => """
     3.8 +        Getopts("""
     3.9  Usage: isabelle build_doc [OPTIONS] [DOCS ...]"
    3.10  
    3.11    Options are:
     4.1 --- a/src/Pure/Tools/check_sources.scala	Sun Feb 28 17:37:20 2016 +0100
     4.2 +++ b/src/Pure/Tools/check_sources.scala	Sun Feb 28 17:40:01 2016 +0100
     4.3 @@ -54,7 +54,7 @@
     4.4    def main(args: Array[String])
     4.5    {
     4.6      Command_Line.tool0 {
     4.7 -      val getopts = Getopts(() => """
     4.8 +      val getopts = Getopts("""
     4.9  Usage: isabelle check_sources [ROOT_DIRS...]
    4.10  
    4.11    Check .thy, .ML, ROOT files from manifest of Mercurial ROOT_DIRS.
     5.1 --- a/src/Pure/Tools/doc.scala	Sun Feb 28 17:37:20 2016 +0100
     5.2 +++ b/src/Pure/Tools/doc.scala	Sun Feb 28 17:40:01 2016 +0100
     5.3 @@ -96,7 +96,7 @@
     5.4    def main(args: Array[String])
     5.5    {
     5.6      Command_Line.tool0 {
     5.7 -      val getopts = Getopts(() => """
     5.8 +      val getopts = Getopts("""
     5.9  Usage: isabelle doc [DOC ...]
    5.10  
    5.11    View Isabelle documentation.
     6.1 --- a/src/Pure/Tools/update_cartouches.scala	Sun Feb 28 17:37:20 2016 +0100
     6.2 +++ b/src/Pure/Tools/update_cartouches.scala	Sun Feb 28 17:40:01 2016 +0100
     6.3 @@ -90,7 +90,7 @@
     6.4        var replace_comment = false
     6.5        var replace_text = false
     6.6  
     6.7 -      val getopts = Getopts(() => """
     6.8 +      val getopts = Getopts("""
     6.9  Usage: isabelle update_cartouches [FILES|DIRS...]
    6.10  
    6.11    Options are:
     7.1 --- a/src/Pure/Tools/update_header.scala	Sun Feb 28 17:37:20 2016 +0100
     7.2 +++ b/src/Pure/Tools/update_header.scala	Sun Feb 28 17:40:01 2016 +0100
     7.3 @@ -33,7 +33,7 @@
     7.4      Command_Line.tool0 {
     7.5        var section = "section"
     7.6  
     7.7 -      val getopts = Getopts(() => """
     7.8 +      val getopts = Getopts("""
     7.9  Usage: isabelle update_header [FILES|DIRS...]
    7.10  
    7.11    Options are:
     8.1 --- a/src/Pure/Tools/update_then.scala	Sun Feb 28 17:37:20 2016 +0100
     8.2 +++ b/src/Pure/Tools/update_then.scala	Sun Feb 28 17:40:01 2016 +0100
     8.3 @@ -33,7 +33,7 @@
     8.4    def main(args: Array[String])
     8.5    {
     8.6      Command_Line.tool0 {
     8.7 -      val getopts = Getopts(() => """
     8.8 +      val getopts = Getopts("""
     8.9  Usage: isabelle update_then [FILES|DIRS...]
    8.10  
    8.11    Recursively find .thy files and expand old Isar command conflations:
     9.1 --- a/src/Pure/Tools/update_theorems.scala	Sun Feb 28 17:37:20 2016 +0100
     9.2 +++ b/src/Pure/Tools/update_theorems.scala	Sun Feb 28 17:40:01 2016 +0100
     9.3 @@ -34,7 +34,7 @@
     9.4    def main(args: Array[String])
     9.5    {
     9.6      Command_Line.tool0 {
     9.7 -      val getopts = Getopts(() => """
     9.8 +      val getopts = Getopts("""
     9.9  Usage: isabelle update_theorems [FILES|DIRS...]
    9.10  
    9.11    Recursively find .thy files and update toplevel theorem keywords: