diff -r ffecea547501 -r 4b056ee5435c src/Pure/Syntax/mixfix.ML --- a/src/Pure/Syntax/mixfix.ML Tue Oct 20 16:29:47 1998 +0200 +++ b/src/Pure/Syntax/mixfix.ML Tue Oct 20 16:30:27 1998 +0200 @@ -16,7 +16,6 @@ Infixl of int | Infixr of int | Binder of string * int * int - val max_pri: int end; signature MIXFIX1 = @@ -47,8 +46,6 @@ structure Mixfix : MIXFIX = struct -open Lexicon SynExt Ast SynTrans; - (** mixfix declarations **) @@ -94,8 +91,8 @@ (* mixfix_args *) fun mixfix_args NoSyn = 0 - | mixfix_args (Mixfix (sy, _, _)) = mfix_args sy - | mixfix_args (Delimfix sy) = mfix_args sy + | mixfix_args (Mixfix (sy, _, _)) = SynExt.mfix_args sy + | mixfix_args (Delimfix sy) = SynExt.mfix_args sy | mixfix_args (*infix or binder*) _ = 2; @@ -106,7 +103,8 @@ fun name_of (t, _, mx) = type_name t mx; fun mk_infix sy t p1 p2 p3 = - Mfix ("(_ " ^ sy ^ "/ _)", [typeT, typeT] ---> typeT, t, [p1, p2], p3); + SynExt.Mfix ("(_ " ^ sy ^ "/ _)", + [SynExt.typeT, SynExt.typeT] ---> SynExt.typeT, t, [p1, p2], p3); fun mfix_of decl = let val t = name_of decl in @@ -121,9 +119,7 @@ val mfix = mapfilter mfix_of type_decls; val xconsts = map name_of type_decls; - in - syn_ext logtypes mfix xconsts ([], [], [], []) [] ([], []) - end; + in SynExt.syn_ext logtypes mfix xconsts ([], [], [], []) [] ([], []) end; (* syn_ext_consts *) @@ -133,8 +129,8 @@ fun name_of (c, _, mx) = const_name c mx; fun mk_infix sy ty c p1 p2 p3 = - [Mfix ("op " ^ sy, ty, c, [], max_pri), - Mfix ("(_ " ^ sy ^ "/ _)", ty, c, [p1, p2], p3)]; + [SynExt.Mfix ("op " ^ sy, ty, c, [], SynExt.max_pri), + SynExt.Mfix ("(_ " ^ sy ^ "/ _)", ty, c, [p1, p2], p3)]; fun binder_typ _ (Type ("fun", [Type ("fun", [_, ty2]), ty3])) = [Type ("idts", []), ty2] ---> ty3 @@ -144,14 +140,14 @@ let val c = name_of decl in (case decl of (_, _, NoSyn) => [] - | (_, ty, Mixfix (sy, ps, p)) => [Mfix (sy, ty, c, ps, p)] - | (_, ty, Delimfix sy) => [Mfix (sy, ty, c, [], max_pri)] + | (_, ty, Mixfix (sy, ps, p)) => [SynExt.Mfix (sy, ty, c, ps, p)] + | (_, ty, Delimfix sy) => [SynExt.Mfix (sy, ty, c, [], SynExt.max_pri)] | (_, ty, InfixlName (sy, p)) => mk_infix sy ty c p (p + 1) p | (_, ty, InfixrName (sy, p)) => mk_infix sy ty c (p + 1) p p | (sy, ty, Infixl p) => mk_infix sy ty c p (p + 1) p | (sy, ty, Infixr p) => mk_infix sy ty c (p + 1) p p | (_, ty, Binder (sy, p, q)) => - [Mfix ("(3" ^ sy ^ "_./ _)", binder_typ c ty, sy, [0, p], q)]) + [SynExt.Mfix ("(3" ^ sy ^ "_./ _)", binder_typ c ty, sy, [0, p], q)]) end; fun binder (c, _, Binder (sy, _, _)) = Some (sy, c) @@ -160,25 +156,24 @@ val mfix = flat (map mfix_of const_decls); val xconsts = map name_of const_decls; val binders = mapfilter binder const_decls; - val binder_trs = map mk_binder_tr binders; - val binder_trs' = map (apsnd fix_tr' o mk_binder_tr' o swap) binders; - in - syn_ext logtypes mfix xconsts ([], binder_trs, binder_trs', []) [] ([], []) - end; + val binder_trs = map SynTrans.mk_binder_tr binders; + val binder_trs' = map (apsnd SynExt.fix_tr' o SynTrans.mk_binder_tr' o swap) binders; + in SynExt.syn_ext logtypes mfix xconsts ([], binder_trs, binder_trs', []) [] ([], []) end; (** Pure syntax **) val pure_nonterms = - (terminals @ [logic, "type", "types", "sort", "classes", args, cargs, - "pttrn", "pttrns", "idt", "idts", "aprop", "asms", any, sprop]); + (Lexicon.terminals @ [SynExt.logic, "type", "types", "sort", "classes", + SynExt.args, SynExt.cargs, "pttrn", "pttrns", "idt", "idts", "aprop", + "asms", SynExt.any, SynExt.sprop]); val pure_syntax = [("_lambda", "[pttrns, 'a] => logic", Mixfix ("(3%_./ _)", [0, 3], 3)), ("_abs", "'a", NoSyn), - ("", "'a => " ^ args, Delimfix "_"), - ("_args", "['a, " ^ args ^ "] => " ^ args, Delimfix "_,/ _"), + ("", "'a => " ^ SynExt.args, Delimfix "_"), + ("_args", "['a, " ^ SynExt.args ^ "] => " ^ SynExt.args, Delimfix "_,/ _"), ("", "id => idt", Delimfix "_"), ("_idtyp", "[id, type] => idt", Mixfix ("_::_", [], 0)), ("", "idt => idt", Delimfix "'(_')"), @@ -204,19 +199,19 @@ ("_BIND", "id => logic", Delimfix "??_")]; val pure_appl_syntax = - [("_appl", "[('b => 'a), args] => logic", Mixfix ("(1_/(1'(_')))", [max_pri, 0], max_pri)), - ("_appl", "[('b => 'a), args] => aprop", Mixfix ("(1_/(1'(_')))", [max_pri, 0], max_pri))]; + [("_appl", "[('b => 'a), args] => logic", Mixfix ("(1_/(1'(_')))", [SynExt.max_pri, 0], SynExt.max_pri)), + ("_appl", "[('b => 'a), args] => aprop", Mixfix ("(1_/(1'(_')))", [SynExt.max_pri, 0], SynExt.max_pri))]; val pure_applC_syntax = [("", "'a => cargs", Delimfix "_"), - ("_cargs", "['a, cargs] => cargs", Mixfix ("_/ _", [max_pri, max_pri], max_pri)), - ("_applC", "[('b => 'a), cargs] => logic", Mixfix ("(1_/ _)", [max_pri, max_pri], max_pri - 1)), - ("_applC", "[('b => 'a), cargs] => aprop", Mixfix ("(1_/ _)", [max_pri, max_pri], max_pri - 1))]; + ("_cargs", "['a, cargs] => cargs", Mixfix ("_/ _", [SynExt.max_pri, SynExt.max_pri], SynExt.max_pri)), + ("_applC", "[('b => 'a), cargs] => logic", Mixfix ("(1_/ _)", [SynExt.max_pri, SynExt.max_pri], SynExt.max_pri - 1)), + ("_applC", "[('b => 'a), cargs] => aprop", Mixfix ("(1_/ _)", [SynExt.max_pri, SynExt.max_pri], SynExt.max_pri - 1))]; val pure_sym_syntax = [("fun", "[type, type] => type", Mixfix ("(_/ \\ _)", [1, 0], 0)), ("_bracket", "[types, type] => type", Mixfix ("([_]/ \\ _)", [0, 0], 0)), - ("_ofsort", "[tid, sort] => type", Mixfix ("_\\_", [max_pri, 0], max_pri)), + ("_ofsort", "[tid, sort] => type", Mixfix ("_\\_", [SynExt.max_pri, 0], SynExt.max_pri)), ("_constrain", "['a, type] => 'a", Mixfix ("_\\_", [4, 0], 3)), ("_idtyp", "[id, type] => idt", Mixfix ("_\\_", [], 0)), ("_lambda", "[pttrns, 'a] => logic", Mixfix ("(3\\_./ _)", [0, 3], 3)),