| author | wenzelm | 
| Mon, 13 Apr 2020 22:08:14 +0200 | |
| changeset 71751 | abf3e80bd815 | 
| parent 69366 | b6dacf6eabe3 | 
| child 71601 | 97ccf48c2f0c | 
| permissions | -rw-r--r-- | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
1  | 
/* Title: Pure/System/options.scala  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
2  | 
Author: Makarius  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
3  | 
|
| 51945 | 4  | 
System options with external string representation.  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
5  | 
*/  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
6  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
7  | 
package isabelle  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
8  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
9  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
10  | 
object Options  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
11  | 
{
 | 
| 48421 | 12  | 
type Spec = (String, Option[String])  | 
13  | 
||
14  | 
val empty: Options = new Options()  | 
|
15  | 
||
16  | 
||
17  | 
/* representation */  | 
|
18  | 
||
19  | 
sealed abstract class Type  | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
20  | 
  {
 | 
| 56599 | 21  | 
def print: String = Word.lowercase(toString)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
22  | 
}  | 
| 49246 | 23  | 
case object Bool extends Type  | 
24  | 
case object Int extends Type  | 
|
25  | 
case object Real extends Type  | 
|
26  | 
case object String extends Type  | 
|
27  | 
case object Unknown extends Type  | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
28  | 
|
| 56465 | 29  | 
case class Opt(  | 
30  | 
public: Boolean,  | 
|
31  | 
pos: Position.T,  | 
|
32  | 
name: String,  | 
|
33  | 
typ: Type,  | 
|
34  | 
value: String,  | 
|
35  | 
default_value: String,  | 
|
36  | 
description: String,  | 
|
37  | 
section: String)  | 
|
| 48860 | 38  | 
  {
 | 
| 49289 | 39  | 
private def print(default: Boolean): String =  | 
40  | 
    {
 | 
|
41  | 
val x = if (default) default_value else value  | 
|
| 49247 | 42  | 
"option " + name + " : " + typ.print + " = " +  | 
| 49289 | 43  | 
(if (typ == Options.String) quote(x) else x) +  | 
44  | 
(if (description == "") "" else "\n -- " + quote(description))  | 
|
45  | 
}  | 
|
46  | 
||
47  | 
def print: String = print(false)  | 
|
48  | 
def print_default: String = print(true)  | 
|
| 49247 | 49  | 
|
| 56559 | 50  | 
def title(strip: String = ""): String =  | 
| 49270 | 51  | 
    {
 | 
| 56600 | 52  | 
      val words = Word.explode('_', name)
 | 
| 49270 | 53  | 
val words1 =  | 
54  | 
        words match {
 | 
|
55  | 
case word :: rest if word == strip => rest  | 
|
56  | 
case _ => words  | 
|
57  | 
}  | 
|
| 
56609
 
5ac67041ccf8
capitalize more carefully, e.g. relevant for option "ML_exception_trace";
 
wenzelm 
parents: 
56600 
diff
changeset
 | 
58  | 
Word.implode(words1.map(Word.perhaps_capitalize(_)))  | 
| 49270 | 59  | 
}  | 
60  | 
||
| 48860 | 61  | 
def unknown: Boolean = typ == Unknown  | 
62  | 
}  | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
63  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
64  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
65  | 
/* parsing */  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
66  | 
|
| 49270 | 67  | 
private val SECTION = "section"  | 
| 
52065
 
78f2475aa126
explicit notion of public options, which are shown in the editor options dialog;
 
wenzelm 
parents: 
51945 
diff
changeset
 | 
68  | 
private val PUBLIC = "public"  | 
| 
48795
 
bece259ee055
clarified format of etc/options: only declarations, not re-definitions;
 
wenzelm 
parents: 
48718 
diff
changeset
 | 
69  | 
private val OPTION = "option"  | 
| 48807 | 70  | 
  private val OPTIONS = Path.explode("etc/options")
 | 
| 67845 | 71  | 
  private val PREFS = Path.explode("$ISABELLE_HOME_USER/etc/preferences")
 | 
| 
48713
 
de26cf3191a3
more token markers, based on actual outer syntax;
 
wenzelm 
parents: 
48693 
diff
changeset
 | 
72  | 
|
| 
67004
 
af72fa58f71b
clarified lazy Completion within Outer_Syntax: measurable speedup of Sessions.deps;
 
wenzelm 
parents: 
66984 
diff
changeset
 | 
73  | 
val options_syntax =  | 
| 
 
af72fa58f71b
clarified lazy Completion within Outer_Syntax: measurable speedup of Sessions.deps;
 
wenzelm 
parents: 
66984 
diff
changeset
 | 
74  | 
Outer_Syntax.empty + ":" + "=" + "--" + Symbol.comment + Symbol.comment_decoded +  | 
| 63441 | 75  | 
(SECTION, Keyword.DOCUMENT_HEADING) +  | 
76  | 
(PUBLIC, Keyword.BEFORE_COMMAND) +  | 
|
77  | 
(OPTION, Keyword.THY_DECL)  | 
|
| 49270 | 78  | 
|
| 
67004
 
af72fa58f71b
clarified lazy Completion within Outer_Syntax: measurable speedup of Sessions.deps;
 
wenzelm 
parents: 
66984 
diff
changeset
 | 
79  | 
val prefs_syntax = Outer_Syntax.empty + "="  | 
| 
48713
 
de26cf3191a3
more token markers, based on actual outer syntax;
 
wenzelm 
parents: 
48693 
diff
changeset
 | 
80  | 
|
| 62968 | 81  | 
trait Parser extends Parse.Parser  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
82  | 
  {
 | 
| 62968 | 83  | 
    val option_name = atom("option name", _.is_name)
 | 
84  | 
    val option_type = atom("option type", _.is_name)
 | 
|
| 48807 | 85  | 
val option_value =  | 
86  | 
      opt(token("-", tok => tok.is_sym_ident && tok.content == "-")) ~ atom("nat", _.is_nat) ^^
 | 
|
87  | 
        { case s ~ n => if (s.isDefined) "-" + n else n } |
 | 
|
88  | 
      atom("option value", tok => tok.is_name || tok.is_float)
 | 
|
| 62968 | 89  | 
}  | 
| 48807 | 90  | 
|
| 68841 | 91  | 
private object Parser extends Parser  | 
| 62968 | 92  | 
  {
 | 
| 61579 | 93  | 
def comment_marker: Parser[String] =  | 
94  | 
      $$$("--") | $$$(Symbol.comment) | $$$(Symbol.comment_decoded)
 | 
|
95  | 
||
| 48807 | 96  | 
val option_entry: Parser[Options => Options] =  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
97  | 
    {
 | 
| 49270 | 98  | 
command(SECTION) ~! text ^^  | 
| 49295 | 99  | 
        { case _ ~ a => (options: Options) => options.set_section(a) } |
 | 
| 
60133
 
a90982bbe8b4
clarified keywords for quasi-command spans and Sidekick structure;
 
wenzelm 
parents: 
59811 
diff
changeset
 | 
100  | 
      opt($$$(PUBLIC)) ~ command(OPTION) ~! (position(option_name) ~ $$$(":") ~ option_type ~
 | 
| 61579 | 101  | 
      $$$("=") ~ option_value ~ (comment_marker ~! text ^^ { case _ ~ x => x } | success(""))) ^^
 | 
| 59811 | 102  | 
        { case a ~ _ ~ ((b, pos) ~ _ ~ c ~ _ ~ d ~ e) =>
 | 
| 56465 | 103  | 
(options: Options) => options.declare(a.isDefined, pos, b, c, d, e) }  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
104  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
105  | 
|
| 48807 | 106  | 
val prefs_entry: Parser[Options => Options] =  | 
107  | 
    {
 | 
|
| 58908 | 108  | 
      option_name ~ ($$$("=") ~! option_value) ^^
 | 
| 48860 | 109  | 
      { case a ~ (_ ~ b) => (options: Options) => options.add_permissive(a, b) }
 | 
| 48807 | 110  | 
}  | 
111  | 
||
| 67845 | 112  | 
def parse_file(options: Options, file_name: String, content: String,  | 
113  | 
syntax: Outer_Syntax = options_syntax,  | 
|
114  | 
parser: Parser[Options => Options] = option_entry): Options =  | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
115  | 
    {
 | 
| 67845 | 116  | 
val toks = Token.explode(syntax.keywords, content)  | 
| 48807 | 117  | 
val ops =  | 
| 67845 | 118  | 
        parse_all(rep(parser), Token.reader(toks, Token.Pos.file(file_name))) match {
 | 
| 48807 | 119  | 
case Success(result, _) => result  | 
120  | 
case bad => error(bad.toString)  | 
|
121  | 
}  | 
|
| 49270 | 122  | 
      try { (options.set_section("") /: ops) { case (opts, op) => op(opts) } }
 | 
| 67845 | 123  | 
      catch { case ERROR(msg) => error(msg + Position.File(file_name)) }
 | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
124  | 
}  | 
| 67845 | 125  | 
|
126  | 
def parse_prefs(options: Options, content: String): Options =  | 
|
| 69366 | 127  | 
parse_file(options, PREFS.file_name, content, syntax = prefs_syntax, parser = prefs_entry)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
128  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
129  | 
|
| 67845 | 130  | 
def read_prefs(file: Path = PREFS): String =  | 
131  | 
if (file.is_file) File.read(file) else ""  | 
|
| 
64186
 
49816908ae42
support for separate sub-system options, independent of main Isabelle options;
 
wenzelm 
parents: 
64151 
diff
changeset
 | 
132  | 
|
| 67847 | 133  | 
def init(prefs: String = read_prefs(PREFS), opts: List[String] = Nil): Options =  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
134  | 
  {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
135  | 
var options = empty  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
136  | 
    for {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
137  | 
dir <- Isabelle_System.components()  | 
| 48548 | 138  | 
file = dir + OPTIONS if file.is_file  | 
| 67845 | 139  | 
    } { options = Parser.parse_file(options, file.implode, File.read(file)) }
 | 
| 67847 | 140  | 
(Options.Parser.parse_prefs(options, prefs) /: opts)(_ + _)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
141  | 
}  | 
| 48457 | 142  | 
|
143  | 
||
144  | 
/* encode */  | 
|
145  | 
||
146  | 
val encode: XML.Encode.T[Options] = (options => options.encode)  | 
|
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
147  | 
|
| 
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
148  | 
|
| 62832 | 149  | 
/* Isabelle tool wrapper */  | 
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
150  | 
|
| 66669 | 151  | 
  val isabelle_tool = Isabelle_Tool("options", "print Isabelle system options", args =>
 | 
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
152  | 
  {
 | 
| 62832 | 153  | 
var build_options = false  | 
154  | 
var get_option = ""  | 
|
155  | 
var list_options = false  | 
|
156  | 
var export_file = ""  | 
|
| 62437 | 157  | 
|
| 62832 | 158  | 
    val getopts = Getopts("""
 | 
| 62437 | 159  | 
Usage: isabelle options [OPTIONS] [MORE_OPTIONS ...]  | 
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
160  | 
|
| 62437 | 161  | 
Options are:  | 
162  | 
-b include $ISABELLE_BUILD_OPTIONS  | 
|
163  | 
-g OPTION get value of OPTION  | 
|
164  | 
-l list options  | 
|
165  | 
-x FILE export options to FILE in YXML format  | 
|
166  | 
||
167  | 
Report Isabelle system options, augmented by MORE_OPTIONS given as  | 
|
168  | 
arguments NAME=VAL or NAME.  | 
|
169  | 
""",  | 
|
| 62832 | 170  | 
"b" -> (_ => build_options = true),  | 
171  | 
"g:" -> (arg => get_option = arg),  | 
|
172  | 
"l" -> (_ => list_options = true),  | 
|
173  | 
"x:" -> (arg => export_file = arg))  | 
|
| 
52737
 
7b396ef36af6
clarified meaning of options for "isabelle options";
 
wenzelm 
parents: 
52735 
diff
changeset
 | 
174  | 
|
| 62832 | 175  | 
val more_options = getopts(args)  | 
176  | 
if (get_option == "" && !list_options && export_file == "") getopts.usage()  | 
|
| 
52737
 
7b396ef36af6
clarified meaning of options for "isabelle options";
 
wenzelm 
parents: 
52735 
diff
changeset
 | 
177  | 
|
| 62832 | 178  | 
val options =  | 
179  | 
    {
 | 
|
180  | 
val options0 = Options.init()  | 
|
181  | 
val options1 =  | 
|
182  | 
if (build_options)  | 
|
183  | 
          (options0 /: Word.explode(Isabelle_System.getenv("ISABELLE_BUILD_OPTIONS")))(_ + _)
 | 
|
184  | 
else options0  | 
|
185  | 
(options1 /: more_options)(_ + _)  | 
|
186  | 
}  | 
|
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
187  | 
|
| 62832 | 188  | 
if (get_option != "")  | 
| 67178 | 189  | 
Output.writeln(options.check_name(get_option).value, stdout = true)  | 
| 62437 | 190  | 
|
| 62832 | 191  | 
if (export_file != "")  | 
192  | 
File.write(Path.explode(export_file), YXML.string_of_body(options.encode))  | 
|
| 62437 | 193  | 
|
| 62832 | 194  | 
if (get_option == "" && export_file == "")  | 
| 67178 | 195  | 
Output.writeln(options.print, stdout = true)  | 
| 62832 | 196  | 
})  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
197  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
198  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
199  | 
|
| 49270 | 200  | 
final class Options private(  | 
| 49296 | 201  | 
val options: Map[String, Options.Opt] = Map.empty,  | 
| 49270 | 202  | 
val section: String = "")  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
203  | 
{
 | 
| 
64186
 
49816908ae42
support for separate sub-system options, independent of main Isabelle options;
 
wenzelm 
parents: 
64151 
diff
changeset
 | 
204  | 
  override def toString: String = options.iterator.mkString("Options(", ",", ")")
 | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
205  | 
|
| 54347 | 206  | 
private def print_opt(opt: Options.Opt): String =  | 
207  | 
if (opt.public) "public " + opt.print else opt.print  | 
|
208  | 
||
209  | 
def print: String = cat_lines(options.toList.sortBy(_._1).map(p => print_opt(p._2)))  | 
|
| 
48693
 
ceeea46bdeba
"isabelle options" prints Isabelle system options;
 
wenzelm 
parents: 
48605 
diff
changeset
 | 
210  | 
|
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
211  | 
def description(name: String): String = check_name(name).description  | 
| 
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
212  | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
213  | 
|
| 48370 | 214  | 
/* check */  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
215  | 
|
| 49246 | 216  | 
def check_name(name: String): Options.Opt =  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
217  | 
    options.get(name) match {
 | 
| 48860 | 218  | 
case Some(opt) if !opt.unknown => opt  | 
219  | 
      case _ => error("Unknown option " + quote(name))
 | 
|
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
220  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
221  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
222  | 
private def check_type(name: String, typ: Options.Type): Options.Opt =  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
223  | 
  {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
224  | 
val opt = check_name(name)  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
225  | 
if (opt.typ == typ) opt  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
226  | 
    else error("Ill-typed option " + quote(name) + " : " + opt.typ.print + " vs. " + typ.print)
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
227  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
228  | 
|
| 48370 | 229  | 
|
230  | 
/* basic operations */  | 
|
231  | 
||
232  | 
private def put[A](name: String, typ: Options.Type, value: String): Options =  | 
|
233  | 
  {
 | 
|
234  | 
val opt = check_type(name, typ)  | 
|
| 49270 | 235  | 
new Options(options + (name -> opt.copy(value = value)), section)  | 
| 48370 | 236  | 
}  | 
237  | 
||
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
238  | 
private def get[A](name: String, typ: Options.Type, parse: String => Option[A]): A =  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
239  | 
  {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
240  | 
val opt = check_type(name, typ)  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
241  | 
    parse(opt.value) match {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
242  | 
case Some(x) => x  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
243  | 
case None =>  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
244  | 
        error("Malformed value for option " + quote(name) +
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
245  | 
" : " + typ.print + " =\n" + quote(opt.value))  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
246  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
247  | 
}  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
248  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
249  | 
|
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
250  | 
/* internal lookup and update */  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
251  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
252  | 
class Bool_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
253  | 
  {
 | 
| 63805 | 254  | 
def apply(name: String): Boolean = get(name, Options.Bool, Value.Boolean.unapply)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
255  | 
def update(name: String, x: Boolean): Options =  | 
| 63805 | 256  | 
put(name, Options.Bool, Value.Boolean(x))  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
257  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
258  | 
val bool = new Bool_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
259  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
260  | 
class Int_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
261  | 
  {
 | 
| 63805 | 262  | 
def apply(name: String): Int = get(name, Options.Int, Value.Int.unapply)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
263  | 
def update(name: String, x: Int): Options =  | 
| 63805 | 264  | 
put(name, Options.Int, Value.Int(x))  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
265  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
266  | 
val int = new Int_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
267  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
268  | 
class Real_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
269  | 
  {
 | 
| 63805 | 270  | 
def apply(name: String): Double = get(name, Options.Real, Value.Double.unapply)  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
271  | 
def update(name: String, x: Double): Options =  | 
| 63805 | 272  | 
put(name, Options.Real, Value.Double(x))  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
273  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
274  | 
val real = new Real_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
275  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
276  | 
class String_Access  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
277  | 
  {
 | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
278  | 
def apply(name: String): String = get(name, Options.String, s => Some(s))  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
279  | 
def update(name: String, x: String): Options = put(name, Options.String, x)  | 
| 
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
280  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
281  | 
val string = new String_Access  | 
| 48370 | 282  | 
|
| 69074 | 283  | 
def proper_string(name: String): Option[String] =  | 
284  | 
Library.proper_string(string(name))  | 
|
285  | 
||
| 69073 | 286  | 
def seconds(name: String): Time = Time.seconds(real(name))  | 
| 50207 | 287  | 
|
| 48370 | 288  | 
|
| 48807 | 289  | 
/* external updates */  | 
| 48370 | 290  | 
|
291  | 
private def check_value(name: String): Options =  | 
|
292  | 
  {
 | 
|
293  | 
val opt = check_name(name)  | 
|
294  | 
    opt.typ match {
 | 
|
295  | 
case Options.Bool => bool(name); this  | 
|
296  | 
case Options.Int => int(name); this  | 
|
297  | 
case Options.Real => real(name); this  | 
|
298  | 
case Options.String => string(name); this  | 
|
| 48860 | 299  | 
case Options.Unknown => this  | 
| 48370 | 300  | 
}  | 
301  | 
}  | 
|
302  | 
||
| 56465 | 303  | 
def declare(  | 
304  | 
public: Boolean,  | 
|
305  | 
pos: Position.T,  | 
|
306  | 
name: String,  | 
|
307  | 
typ_name: String,  | 
|
308  | 
value: String,  | 
|
309  | 
description: String): Options =  | 
|
| 48370 | 310  | 
  {
 | 
311  | 
    options.get(name) match {
 | 
|
| 56465 | 312  | 
case Some(other) =>  | 
313  | 
        error("Duplicate declaration of option " + quote(name) + Position.here(pos) +
 | 
|
314  | 
Position.here(other.pos))  | 
|
| 48370 | 315  | 
case None =>  | 
316  | 
val typ =  | 
|
317  | 
          typ_name match {
 | 
|
318  | 
case "bool" => Options.Bool  | 
|
319  | 
case "int" => Options.Int  | 
|
320  | 
case "real" => Options.Real  | 
|
321  | 
case "string" => Options.String  | 
|
| 56465 | 322  | 
case _ =>  | 
323  | 
              error("Unknown type for option " + quote(name) + " : " + quote(typ_name) +
 | 
|
324  | 
Position.here(pos))  | 
|
| 48370 | 325  | 
}  | 
| 56465 | 326  | 
val opt = Options.Opt(public, pos, name, typ, value, value, description, section)  | 
| 49270 | 327  | 
(new Options(options + (name -> opt), section)).check_value(name)  | 
| 48370 | 328  | 
}  | 
329  | 
}  | 
|
330  | 
||
| 48860 | 331  | 
def add_permissive(name: String, value: String): Options =  | 
332  | 
  {
 | 
|
333  | 
if (options.isDefinedAt(name)) this + (name, value)  | 
|
| 56465 | 334  | 
    else {
 | 
335  | 
val opt = Options.Opt(false, Position.none, name, Options.Unknown, value, value, "", "")  | 
|
336  | 
new Options(options + (name -> opt), section)  | 
|
337  | 
}  | 
|
| 48860 | 338  | 
}  | 
339  | 
||
| 48807 | 340  | 
def + (name: String, value: String): Options =  | 
| 48370 | 341  | 
  {
 | 
342  | 
val opt = check_name(name)  | 
|
| 49270 | 343  | 
(new Options(options + (name -> opt.copy(value = value)), section)).check_value(name)  | 
| 48370 | 344  | 
}  | 
345  | 
||
| 48807 | 346  | 
def + (name: String, opt_value: Option[String]): Options =  | 
| 48370 | 347  | 
  {
 | 
348  | 
val opt = check_name(name)  | 
|
349  | 
    opt_value match {
 | 
|
| 48807 | 350  | 
case Some(value) => this + (name, value)  | 
351  | 
case None if opt.typ == Options.Bool => this + (name, "true")  | 
|
| 48370 | 352  | 
      case None => error("Missing value for option " + quote(name) + " : " + opt.typ.print)
 | 
353  | 
}  | 
|
354  | 
}  | 
|
355  | 
||
| 48807 | 356  | 
def + (str: String): Options =  | 
| 48370 | 357  | 
  {
 | 
358  | 
    str.indexOf('=') match {
 | 
|
| 48807 | 359  | 
case -1 => this + (str, None)  | 
360  | 
case i => this + (str.substring(0, i), str.substring(i + 1))  | 
|
| 48370 | 361  | 
}  | 
362  | 
}  | 
|
| 
48456
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
363  | 
|
| 48807 | 364  | 
def ++ (specs: List[Options.Spec]): Options =  | 
365  | 
    (this /: specs)({ case (x, (y, z)) => x + (y, z) })
 | 
|
366  | 
||
| 
48456
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
367  | 
|
| 49270 | 368  | 
/* sections */  | 
369  | 
||
370  | 
def set_section(new_section: String): Options =  | 
|
371  | 
new Options(options, new_section)  | 
|
372  | 
||
373  | 
def sections: List[(String, List[Options.Opt])] =  | 
|
374  | 
    options.groupBy(_._2.section).toList.map({ case (a, opts) => (a, opts.toList.map(_._2)) })
 | 
|
375  | 
||
376  | 
||
| 
48456
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
377  | 
/* encode */  | 
| 
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
378  | 
|
| 
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
379  | 
def encode: XML.Body =  | 
| 
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
380  | 
  {
 | 
| 48860 | 381  | 
val opts =  | 
| 56465 | 382  | 
for ((_, opt) <- options.toList; if !opt.unknown)  | 
383  | 
yield (opt.pos, (opt.name, (opt.typ.print, opt.value)))  | 
|
| 48860 | 384  | 
|
| 56465 | 385  | 
    import XML.Encode.{string => string_, _}
 | 
386  | 
list(pair(properties, pair(string_, pair(string_, string_))))(opts)  | 
|
| 
48456
 
d8ff14f44a40
added ML version of stand-alone options, with XML.encode/decode operations (unidirectional from Scala to ML);
 
wenzelm 
parents: 
48421 
diff
changeset
 | 
387  | 
}  | 
| 48807 | 388  | 
|
389  | 
||
| 67845 | 390  | 
/* save preferences */  | 
| 48807 | 391  | 
|
| 67845 | 392  | 
def save_prefs(file: Path = Options.PREFS)  | 
| 48807 | 393  | 
  {
 | 
| 67845 | 394  | 
val defaults: Options = Options.init(prefs = "")  | 
| 48807 | 395  | 
val changed =  | 
396  | 
      (for {
 | 
|
| 48860 | 397  | 
(name, opt2) <- options.iterator  | 
398  | 
opt1 = defaults.options.get(name)  | 
|
| 60215 | 399  | 
if opt1.isEmpty || opt1.get.value != opt2.value  | 
| 48860 | 400  | 
} yield (name, opt2.value, if (opt1.isEmpty) " (* unknown *)" else "")).toList  | 
401  | 
||
| 48807 | 402  | 
val prefs =  | 
403  | 
changed.sortBy(_._1)  | 
|
| 48860 | 404  | 
        .map({ case (x, y, z) => x + " = " + Outer_Syntax.quote_string(y) + z + "\n" }).mkString
 | 
| 48807 | 405  | 
|
| 67845 | 406  | 
Isabelle_System.mkdirs(file.dir)  | 
407  | 
File.write_backup(file, "(* generated by Isabelle " + Date.now() + " *)\n\n" + prefs)  | 
|
| 48807 | 408  | 
}  | 
| 
48365
 
d88aefda01c4
basic support for stand-alone options with external string representation;
 
wenzelm 
parents:  
diff
changeset
 | 
409  | 
}  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
410  | 
|
| 
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
411  | 
|
| 
65236
 
4fa82bbb394e
afford early initialization of JEdit_Options, but it may lead to messy exception trace for malformed etc/preferences (see also 6eeaaefcea56);
 
wenzelm 
parents: 
64186 
diff
changeset
 | 
412  | 
class Options_Variable(init_options: Options)  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
413  | 
{
 | 
| 
65236
 
4fa82bbb394e
afford early initialization of JEdit_Options, but it may lead to messy exception trace for malformed etc/preferences (see also 6eeaaefcea56);
 
wenzelm 
parents: 
64186 
diff
changeset
 | 
414  | 
private var options = init_options  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
415  | 
|
| 
65236
 
4fa82bbb394e
afford early initialization of JEdit_Options, but it may lead to messy exception trace for malformed etc/preferences (see also 6eeaaefcea56);
 
wenzelm 
parents: 
64186 
diff
changeset
 | 
416  | 
  def value: Options = synchronized { options }
 | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
417  | 
|
| 
65236
 
4fa82bbb394e
afford early initialization of JEdit_Options, but it may lead to messy exception trace for malformed etc/preferences (see also 6eeaaefcea56);
 
wenzelm 
parents: 
64186 
diff
changeset
 | 
418  | 
  private def upd(f: Options => Options): Unit = synchronized { options = f(options) }
 | 
| 
 
4fa82bbb394e
afford early initialization of JEdit_Options, but it may lead to messy exception trace for malformed etc/preferences (see also 6eeaaefcea56);
 
wenzelm 
parents: 
64186 
diff
changeset
 | 
419  | 
def += (name: String, x: String): Unit = upd(opts => opts + (name, x))  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
420  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
421  | 
class Bool_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
422  | 
  {
 | 
| 
62227
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
423  | 
def apply(name: String): Boolean = value.bool(name)  | 
| 
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
424  | 
def update(name: String, x: Boolean): Unit = upd(opts => opts.bool.update(name, x))  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
425  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
426  | 
val bool = new Bool_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
427  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
428  | 
class Int_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
429  | 
  {
 | 
| 
62227
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
430  | 
def apply(name: String): Int = value.int(name)  | 
| 
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
431  | 
def update(name: String, x: Int): Unit = upd(opts => opts.int.update(name, x))  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
432  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
433  | 
val int = new Int_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
434  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
435  | 
class Real_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
436  | 
  {
 | 
| 
62227
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
437  | 
def apply(name: String): Double = value.real(name)  | 
| 
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
438  | 
def update(name: String, x: Double): Unit = upd(opts => opts.real.update(name, x))  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
439  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
440  | 
val real = new Real_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
441  | 
|
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
442  | 
class String_Access  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
443  | 
  {
 | 
| 
62227
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
444  | 
def apply(name: String): String = value.string(name)  | 
| 
 
6eeaaefcea56
clarified errors: more explicit treatment of uninitialized state;
 
wenzelm 
parents: 
61579 
diff
changeset
 | 
445  | 
def update(name: String, x: String): Unit = upd(opts => opts.string.update(name, x))  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
446  | 
}  | 
| 
49954
 
44658062d822
more explicit auxiliary classes to avoid warning "reflective access of structural type member method" of scala-2.10.0-RC1;
 
wenzelm 
parents: 
49296 
diff
changeset
 | 
447  | 
val string = new String_Access  | 
| 50207 | 448  | 
|
| 69074 | 449  | 
def proper_string(name: String): Option[String] =  | 
450  | 
Library.proper_string(string(name))  | 
|
451  | 
||
| 69073 | 452  | 
def seconds(name: String): Time = value.seconds(name)  | 
| 
49245
 
cb70157293c0
manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
 
wenzelm 
parents: 
48992 
diff
changeset
 | 
453  | 
}  |