1.1 --- a/src/Pure/Isar/args.ML Mon May 17 15:05:32 2010 +0200
1.2 +++ b/src/Pure/Isar/args.ML Mon May 17 15:11:25 2010 +0200
1.3 @@ -7,10 +7,9 @@
1.4
1.5 signature ARGS =
1.6 sig
1.7 - type token = OuterLex.token
1.8 type src
1.9 - val src: (string * token list) * Position.T -> src
1.10 - val dest_src: src -> (string * token list) * Position.T
1.11 + val src: (string * Token.T list) * Position.T -> src
1.12 + val dest_src: src -> (string * Token.T list) * Position.T
1.13 val pretty_src: Proof.context -> src -> Pretty.T
1.14 val map_name: (string -> string) -> src -> src
1.15 val morph_values: morphism -> src -> src
1.16 @@ -57,8 +56,8 @@
1.17 val const: bool -> string context_parser
1.18 val const_proper: bool -> string context_parser
1.19 val goal_spec: ((int -> tactic) -> tactic) context_parser
1.20 - val parse: token list parser
1.21 - val parse1: (string -> bool) -> token list parser
1.22 + val parse: Token.T list parser
1.23 + val parse1: (string -> bool) -> Token.T list parser
1.24 val attribs: (string -> string) -> src list parser
1.25 val opt_attribs: (string -> string) -> src list parser
1.26 val thm_name: (string -> string) -> string -> (binding * src list) parser
1.27 @@ -70,15 +69,9 @@
1.28 structure Args: ARGS =
1.29 struct
1.30
1.31 -structure T = OuterLex;
1.32 -
1.33 -type token = T.token;
1.34 -
1.35 -
1.36 -
1.37 (** datatype src **)
1.38
1.39 -datatype src = Src of (string * token list) * Position.T;
1.40 +datatype src = Src of (string * Token.T list) * Position.T;
1.41
1.42 val src = Src;
1.43 fun dest_src (Src src) = src;
1.44 @@ -87,12 +80,12 @@
1.45 let
1.46 val prt_thm = Pretty.backquote o Display.pretty_thm ctxt;
1.47 fun prt arg =
1.48 - (case T.get_value arg of
1.49 - SOME (T.Text s) => Pretty.str (quote s)
1.50 - | SOME (T.Typ T) => Syntax.pretty_typ ctxt T
1.51 - | SOME (T.Term t) => Syntax.pretty_term ctxt t
1.52 - | SOME (T.Fact ths) => Pretty.enclose "(" ")" (Pretty.breaks (map prt_thm ths))
1.53 - | _ => Pretty.str (T.unparse arg));
1.54 + (case Token.get_value arg of
1.55 + SOME (Token.Text s) => Pretty.str (quote s)
1.56 + | SOME (Token.Typ T) => Syntax.pretty_typ ctxt T
1.57 + | SOME (Token.Term t) => Syntax.pretty_term ctxt t
1.58 + | SOME (Token.Fact ths) => Pretty.enclose "(" ")" (Pretty.breaks (map prt_thm ths))
1.59 + | _ => Pretty.str (Token.unparse arg));
1.60 val (s, args) = #1 (dest_src src);
1.61 in Pretty.block (Pretty.breaks (Pretty.str s :: map prt args)) end;
1.62
1.63 @@ -102,15 +95,15 @@
1.64
1.65 (* values *)
1.66
1.67 -fun morph_values phi = map_args (T.map_value
1.68 - (fn T.Text s => T.Text s
1.69 - | T.Typ T => T.Typ (Morphism.typ phi T)
1.70 - | T.Term t => T.Term (Morphism.term phi t)
1.71 - | T.Fact ths => T.Fact (Morphism.fact phi ths)
1.72 - | T.Attribute att => T.Attribute (Morphism.transform phi att)));
1.73 +fun morph_values phi = map_args (Token.map_value
1.74 + (fn Token.Text s => Token.Text s
1.75 + | Token.Typ T => Token.Typ (Morphism.typ phi T)
1.76 + | Token.Term t => Token.Term (Morphism.term phi t)
1.77 + | Token.Fact ths => Token.Fact (Morphism.fact phi ths)
1.78 + | Token.Attribute att => Token.Attribute (Morphism.transform phi att)));
1.79
1.80 -val assignable = map_args T.assignable;
1.81 -val closure = map_args T.closure;
1.82 +val assignable = map_args Token.assignable;
1.83 +val closure = map_args Token.closure;
1.84
1.85
1.86
1.87 @@ -134,7 +127,7 @@
1.88 val alt_string = token Parse.alt_string;
1.89 val symbolic = token Parse.keyword_ident_or_symbolic;
1.90
1.91 -fun $$$ x = (ident >> T.content_of || Parse.keyword)
1.92 +fun $$$ x = (ident >> Token.content_of || Parse.keyword)
1.93 :|-- (fn y => if x = y then Scan.succeed x else Scan.fail);
1.94
1.95
1.96 @@ -153,39 +146,40 @@
1.97 fun mode s = Scan.lift (Scan.optional (parens ($$$ s) >> K true) false);
1.98 fun maybe scan = $$$ "_" >> K NONE || scan >> SOME;
1.99
1.100 -val name_source = named >> T.source_of;
1.101 -val name_source_position = named >> T.source_position_of;
1.102 +val name_source = named >> Token.source_of;
1.103 +val name_source_position = named >> Token.source_position_of;
1.104
1.105 -val name = named >> T.content_of;
1.106 +val name = named >> Token.content_of;
1.107 val binding = Parse.position name >> Binding.make;
1.108 -val alt_name = alt_string >> T.content_of;
1.109 -val symbol = symbolic >> T.content_of;
1.110 +val alt_name = alt_string >> Token.content_of;
1.111 +val symbol = symbolic >> Token.content_of;
1.112 val liberal_name = symbol || name;
1.113
1.114 -val var = (ident >> T.content_of) :|-- (fn x =>
1.115 +val var = (ident >> Token.content_of) :|-- (fn x =>
1.116 (case Lexicon.read_variable x of SOME v => Scan.succeed v | NONE => Scan.fail));
1.117
1.118
1.119 (* values *)
1.120
1.121 fun value dest = Scan.some (fn arg =>
1.122 - (case T.get_value arg of SOME v => (SOME (dest v) handle Match => NONE) | NONE => NONE));
1.123 + (case Token.get_value arg of SOME v => (SOME (dest v) handle Match => NONE) | NONE => NONE));
1.124
1.125 fun evaluate mk eval arg =
1.126 - let val x = eval arg in (T.assign (SOME (mk x)) arg; x) end;
1.127 + let val x = eval arg in (Token.assign (SOME (mk x)) arg; x) end;
1.128
1.129 -val internal_text = value (fn T.Text s => s);
1.130 -val internal_typ = value (fn T.Typ T => T);
1.131 -val internal_term = value (fn T.Term t => t);
1.132 -val internal_fact = value (fn T.Fact ths => ths);
1.133 -val internal_attribute = value (fn T.Attribute att => att);
1.134 +val internal_text = value (fn Token.Text s => s);
1.135 +val internal_typ = value (fn Token.Typ T => T);
1.136 +val internal_term = value (fn Token.Term t => t);
1.137 +val internal_fact = value (fn Token.Fact ths => ths);
1.138 +val internal_attribute = value (fn Token.Attribute att => att);
1.139
1.140 -fun named_text intern = internal_text || named >> evaluate T.Text (intern o T.content_of);
1.141 -fun named_typ readT = internal_typ || named >> evaluate T.Typ (readT o T.source_of);
1.142 -fun named_term read = internal_term || named >> evaluate T.Term (read o T.source_of);
1.143 -fun named_fact get = internal_fact || named >> evaluate T.Fact (get o T.content_of) ||
1.144 - alt_string >> evaluate T.Fact (get o T.source_of);
1.145 -fun named_attribute att = internal_attribute || named >> evaluate T.Attribute (att o T.content_of);
1.146 +fun named_text intern = internal_text || named >> evaluate Token.Text (intern o Token.content_of);
1.147 +fun named_typ readT = internal_typ || named >> evaluate Token.Typ (readT o Token.source_of);
1.148 +fun named_term read = internal_term || named >> evaluate Token.Term (read o Token.source_of);
1.149 +fun named_fact get = internal_fact || named >> evaluate Token.Fact (get o Token.content_of) ||
1.150 + alt_string >> evaluate Token.Fact (get o Token.source_of);
1.151 +fun named_attribute att =
1.152 + internal_attribute || named >> evaluate Token.Attribute (att o Token.content_of);
1.153
1.154
1.155 (* terms and types *)
1.156 @@ -243,7 +237,7 @@
1.157 (token (Parse.$$$ l) ::: Parse.!!! (args true @@@ (token (Parse.$$$ r) >> single))) x;
1.158 in (args, args1) end;
1.159
1.160 -val parse = #1 (parse_args T.ident_or_symbolic) false;
1.161 +val parse = #1 (parse_args Token.ident_or_symbolic) false;
1.162 fun parse1 is_symid = #2 (parse_args is_symid) false;
1.163
1.164
1.165 @@ -252,7 +246,7 @@
1.166 fun attribs intern =
1.167 let
1.168 val attrib_name = internal_text || (symbolic || named)
1.169 - >> evaluate T.Text (intern o T.content_of);
1.170 + >> evaluate Token.Text (intern o Token.content_of);
1.171 val attrib = Parse.position (attrib_name -- Parse.!!! parse) >> src;
1.172 in $$$ "[" |-- Parse.!!! (Parse.list attrib --| $$$ "]") end;
1.173
1.174 @@ -273,11 +267,11 @@
1.175 (** syntax wrapper **)
1.176
1.177 fun syntax kind scan (Src ((s, args), pos)) st =
1.178 - (case Scan.error (Scan.finite' T.stopper (Scan.option scan)) (st, args) of
1.179 + (case Scan.error (Scan.finite' Token.stopper (Scan.option scan)) (st, args) of
1.180 (SOME x, (st', [])) => (x, st')
1.181 | (_, (_, args')) =>
1.182 error (kind ^ " " ^ quote s ^ Position.str_of pos ^ ": bad arguments\n " ^
1.183 - space_implode " " (map T.unparse args')));
1.184 + space_implode " " (map Token.unparse args')));
1.185
1.186 fun context_syntax kind scan src = apsnd Context.the_proof o syntax kind scan src o Context.Proof;
1.187