--- a/src/Pure/Syntax/syntax.ML Wed Jan 19 14:15:01 1994 +0100
+++ b/src/Pure/Syntax/syntax.ML Wed Jan 19 14:21:26 1994 +0100
@@ -3,17 +3,13 @@
Author: Tobias Nipkow and Markus Wenzel, TU Muenchen
Root of Isabelle's syntax module.
-
-TODO:
- fix empty_tables, extend_tables, mk_tables (requires empty_gram, extend_gram)
- fix extend (requires extend_tables)
*)
signature SYNTAX =
sig
include AST0
include LEXICON0
- include EXTENSION0
+ include SYN_EXT0
include TYPE_EXT0
include SEXTENSION1
include PRINTER0
@@ -27,6 +23,7 @@
val test_read: syntax -> string -> string -> unit
val read: syntax -> typ -> string -> term
val read_typ: syntax -> (indexname -> sort) -> string -> typ
+ val simple_read_typ: string -> typ
val pretty_term: syntax -> term -> Pretty.T
val pretty_typ: syntax -> typ -> Pretty.T
val string_of_term: syntax -> term -> string
@@ -34,118 +31,120 @@
end;
functor SyntaxFun(structure Symtab: SYMTAB and TypeExt: TYPE_EXT
- and Parser: PARSER and SExtension: SEXTENSION and Printer: PRINTER
- sharing TypeExt.Extension = SExtension.Extension
- and Parser.XGram = TypeExt.Extension.XGram = Printer.XGram
- and Parser.XGram.Ast = Parser.ParseTree.Ast): SYNTAX =
+ and SExtension: SEXTENSION and Printer: PRINTER
+ sharing SExtension.Parser.SynExt = TypeExt.SynExt = Printer.SynExt)(*: SYNTAX *) = (* FIXME *)
struct
-structure Extension = TypeExt.Extension;
-structure XGram = Extension.XGram;
-structure Lexicon = Parser.ParseTree.Lexicon;
-open Lexicon Parser Parser.ParseTree Extension TypeExt SExtension Printer
- XGram XGram.Ast;
+structure SynExt = TypeExt.SynExt;
+structure Parser = SExtension.Parser;
+structure Lexicon = Parser.Lexicon;
+open Lexicon SynExt SynExt.Ast Parser TypeExt SExtension Printer;
+
+
+(** tables of translation functions **)
+
+(*the ref serves as unique id*)
+type 'a trtab = (('a list -> 'a) * unit ref) Symtab.table;
+
+val dest_trtab = Symtab.alist_of;
+
+fun lookup_trtab tab c =
+ apsome fst (Symtab.lookup (tab, c));
-fun lookup tab a = Symtab.lookup (tab, a);
+(* empty, extend, merge trtabs *)
+
+fun err_dup_trfun name c =
+ error ("More than one " ^ name ^ " for " ^ quote c);
+
+val empty_trtab = Symtab.null;
+
+fun extend_trtab tab trfuns name =
+ Symtab.extend eq_snd (tab, map (fn (c, f) => (c, (f, ref ()))) trfuns)
+ handle Symtab.DUPLICATE c => err_dup_trfun name c;
+
+fun merge_trtabs tab1 tab2 name =
+ Symtab.merge eq_snd (tab1, tab2)
+ handle Symtab.DUPLICATE c => err_dup_trfun name c;
+
+
+
+(** tables of translation rules **)
+
+type ruletab = (ast * ast) list Symtab.table;
+
+fun dest_ruletab tab = flat (map snd (Symtab.alist_of tab));
+
+
+(* lookup_ruletab *)
+
+fun lookup_ruletab tab =
+ if Symtab.is_null tab then None
+ else Some (fn a => Symtab.lookup_multi (tab, a));
+
+
+(* empty, extend, merge ruletabs *)
+
+val empty_ruletab = Symtab.null;
+
+fun extend_ruletab tab rules =
+ generic_extend (op =) Symtab.dest_multi Symtab.make_multi tab
+ (map (fn r => (head_of_rule r, r)) (distinct rules));
+
+fun merge_ruletabs tab1 tab2 =
+ generic_merge (op =) Symtab.dest_multi Symtab.make_multi tab1 tab2;
(** datatype syntax **)
-datatype tables =
- Tabs of {
+datatype syntax =
+ Syntax of {
lexicon: lexicon,
roots: string list,
gram: gram,
consts: string list,
- parse_ast_trtab: (ast list -> ast) Symtab.table,
- parse_ruletab: (ast * ast) list Symtab.table,
- parse_trtab: (term list -> term) Symtab.table,
- print_trtab: (term list -> term) Symtab.table,
- print_ruletab: (ast * ast) list Symtab.table,
+ parse_ast_trtab: ast trtab,
+ parse_ruletab: ruletab,
+ parse_trtab: term trtab,
+ print_trtab: term trtab,
+ print_ruletab: ruletab,
+ print_ast_trtab: ast trtab,
prtab: prtab};
-datatype gramgraph =
- EmptyGG |
- ExtGG of gramgraph ref * ext |
- MergeGG of gramgraph ref * gramgraph ref;
-
-datatype syntax = Syntax of gramgraph ref * tables;
-
-
-
-(*** compile syntax ***)
-
-(* translation funs *)
-
-fun extend_trtab tab trfuns name =
- Symtab.balance (Symtab.st_of_alist (trfuns, tab)) handle Symtab.DUPLICATE s
- => error ("More than one " ^ name ^ " for " ^ quote s);
-
-val mk_trtab = extend_trtab Symtab.null;
-
-(* translation rules *)
+(* empty_syntax *)
-fun mk_ruletab rules =
- let
- fun add_rule (r, tab) =
- let val a = head_of_rule r;
- in
- (case lookup tab a of
- None => Symtab.update ((a, [r]), tab)
- | Some rs => Symtab.update ((a, r :: rs), tab))
- end;
- in
- Symtab.balance (foldr add_rule (rules, Symtab.null))
- end;
-
-fun extend_ruletab tab rules =
- mk_ruletab (flat (map #2 (Symtab.alist_of tab)) @ rules);
-
-
-
-(** tables **)
-
-(* empty_tables *)
-
-(*(* FIXME *)
-val empty_tables =
- Tabs {
+val empty_syntax =
+ Syntax {
lexicon = empty_lexicon,
roots = [],
gram = empty_gram,
consts = [],
- parse_ast_trtab = Symtab.null,
- parse_ruletab = Symtab.null,
- parse_trtab = Symtab.null,
- print_trtab = Symtab.null,
- print_ruletab = Symtab.null,
+ parse_ast_trtab = empty_trtab,
+ parse_ruletab = empty_ruletab,
+ parse_trtab = empty_trtab,
+ print_trtab = empty_trtab,
+ print_ruletab = empty_ruletab,
+ print_ast_trtab = empty_trtab,
prtab = empty_prtab};
-*)
-(* extend_tables *)
+(* extend_syntax *)
-fun extend_tables (Tabs tabs) (XGram xgram) =
+fun extend_syntax (Syntax tabs) syn_ext =
let
val {lexicon, roots = roots1, gram, consts = consts1, parse_ast_trtab,
- parse_ruletab, parse_trtab, print_trtab, print_ruletab, prtab} = tabs;
- val {roots = roots2, prods, consts = consts2, parse_ast_translation,
+ parse_ruletab, parse_trtab, print_trtab, print_ruletab, print_ast_trtab,
+ prtab} = tabs;
+ val SynExt {roots = roots2, xprods, consts = consts2, parse_ast_translation,
parse_rules, parse_translation, print_translation, print_rules,
- print_ast_translation} = xgram;
+ print_ast_translation} = syn_ext;
in
- (* FIXME *)
- if not (null prods) then
- error "extend_tables: called with non-empty prods"
- else
-
- Tabs {
- lexicon = extend_lexicon lexicon (literals_of prods),
- roots = roots2 union roots1,
- (* gram = extend_gram gram roots2 prods, *) (* FIXME *)
- gram = gram, (* FIXME *)
+ Syntax {
+ lexicon = extend_lexicon lexicon (delims_of xprods),
+ roots = extend_list roots1 roots2,
+ gram = extend_gram gram roots2 xprods,
consts = consts2 union consts1,
parse_ast_trtab =
extend_trtab parse_ast_trtab parse_ast_translation "parse ast translation",
@@ -153,176 +152,116 @@
parse_trtab = extend_trtab parse_trtab parse_translation "parse translation",
print_trtab = extend_trtab print_trtab print_translation "print translation",
print_ruletab = extend_ruletab print_ruletab print_rules,
- prtab = extend_prtab prtab prods print_ast_translation}
- end;
-
-
-(* mk_tables *)
-
-(* FIXME *)
-(* val mk_tables = extend_tables empty_tables; *)
-
-(* FIXME *)
-fun mk_tables (XGram xgram) =
- let
- val {roots, prods, consts, parse_ast_translation, parse_rules,
- parse_translation, print_translation, print_rules,
- print_ast_translation} = xgram;
- in
- Tabs {
- lexicon = mk_lexicon (literals_of prods),
- roots = roots,
- gram = mk_gram roots prods,
- consts = consts,
- parse_ast_trtab = mk_trtab parse_ast_translation "parse ast translation",
- parse_ruletab = mk_ruletab parse_rules,
- parse_trtab = mk_trtab parse_translation "parse translation",
- print_trtab = mk_trtab print_translation "print translation",
- print_ruletab = mk_ruletab print_rules,
- prtab = mk_prtab prods print_ast_translation}
+ print_ast_trtab =
+ extend_trtab print_ast_trtab print_ast_translation "print ast translation",
+ prtab = extend_prtab prtab xprods}
end;
-(* ggr_to_xgram *)
+(* merge_syntaxes *)
-fun ggr_to_xgram ggr =
+fun merge_syntaxes (Syntax tabs1) (Syntax tabs2) =
let
- fun flatGG ggr (xg, v) =
- if ggr mem v then (xg, v) else flatGG' ggr (xg, ggr :: v)
- and flatGG' (ref EmptyGG) xgv = xgv
- | flatGG' (ref (ExtGG (ggr, ext))) xgv =
- let
- val (xg', v') = flatGG ggr xgv;
- in
- (extend_xgram xg' ext, v')
- end
- | flatGG' (ref (MergeGG (ggr1, ggr2))) xgv =
- flatGG ggr1 (flatGG ggr2 xgv);
+ val {lexicon = lexicon1, roots = roots1, gram = gram1, consts = consts1,
+ parse_ast_trtab = parse_ast_trtab1, parse_ruletab = parse_ruletab1,
+ parse_trtab = parse_trtab1, print_trtab = print_trtab1,
+ print_ruletab = print_ruletab1, print_ast_trtab = print_ast_trtab1,
+ prtab = prtab1} = tabs1;
+
+ val {lexicon = lexicon2, roots = roots2, gram = gram2, consts = consts2,
+ parse_ast_trtab = parse_ast_trtab2, parse_ruletab = parse_ruletab2,
+ parse_trtab = parse_trtab2, print_trtab = print_trtab2,
+ print_ruletab = print_ruletab2, print_ast_trtab = print_ast_trtab2,
+ prtab = prtab2} = tabs2;
in
- #1 (flatGG ggr (empty_xgram, []))
+ Syntax {
+ lexicon = merge_lexicons lexicon1 lexicon2,
+ roots = merge_lists roots1 roots2,
+ gram = merge_grams gram1 gram2,
+ consts = merge_lists consts1 consts2,
+ parse_ast_trtab =
+ merge_trtabs parse_ast_trtab1 parse_ast_trtab2 "parse ast translation",
+ parse_ruletab = merge_ruletabs parse_ruletab1 parse_ruletab2,
+ parse_trtab = merge_trtabs parse_trtab1 parse_trtab2 "parse translation",
+ print_trtab = merge_trtabs print_trtab1 print_trtab2 "print translation",
+ print_ruletab = merge_ruletabs print_ruletab1 print_ruletab2,
+ print_ast_trtab =
+ merge_trtabs print_ast_trtab1 print_ast_trtab2 "print ast translation",
+ prtab = merge_prtabs prtab1 prtab2}
end;
-(* mk_syntax *)
-fun mk_syntax ggr = Syntax (ggr, mk_tables (ggr_to_xgram ggr));
-
-
-
-(*** inspect syntax ***)
-
-fun xgram_of (Syntax (ggr, _)) = ggr_to_xgram ggr;
+(** inspect syntax **)
fun string_of_big_list name prts =
- Pretty.string_of (Pretty.blk (2,
- separate Pretty.fbrk (Pretty.str name :: prts)));
+ Pretty.string_of (Pretty.block (Pretty.fbreaks (Pretty.str name :: prts)));
fun string_of_strings name strs =
- Pretty.string_of (Pretty.blk (2,
- separate (Pretty.brk 1)
- (map Pretty.str (name :: map quote (sort_strings strs)))));
+ Pretty.string_of (Pretty.block (Pretty.breaks
+ (map Pretty.str (name :: map quote (sort_strings strs)))));
(* print_gram *)
-fun prt_gram (XGram {roots, prods, ...}) =
+fun print_gram (Syntax tabs) =
let
- fun pretty_name name = [Pretty.str (name ^ " ="), Pretty.brk 1];
-
- fun pretty_xsymbs (Terminal s :: xs) =
- Pretty.str (quote s) :: Pretty.brk 1 :: pretty_xsymbs xs
- | pretty_xsymbs (Nonterminal (s, p) :: xs) =
- (if is_terminal s then Pretty.str s
- else Pretty.str (s ^ "[" ^ string_of_int p ^ "]"))
- :: Pretty.brk 1 :: pretty_xsymbs xs
- | pretty_xsymbs (_ :: xs) = pretty_xsymbs xs
- | pretty_xsymbs [] = [];
-
- fun pretty_const "" = [Pretty.brk 1]
- | pretty_const c = [Pretty.str (" => " ^ quote c), Pretty.brk 1];
-
- fun pretty_pri p = [Pretty.str ("(" ^ string_of_int p ^ ")")];
-
- fun pretty_prod (Prod (name, xsymbs, const, pri)) =
- Pretty.blk (2, pretty_name name @ pretty_xsymbs xsymbs @
- pretty_const const @ pretty_pri pri);
+ val {lexicon, roots, gram, ...} = tabs;
in
- writeln (string_of_strings "lexicon:" (literals_of prods));
- writeln (Pretty.string_of (Pretty.blk (2,
- separate (Pretty.brk 1) (map Pretty.str ("roots:" :: roots)))));
- writeln (string_of_big_list "prods:" (map pretty_prod prods))
+ writeln (string_of_strings "lexicon:" (dest_lexicon lexicon));
+ writeln (Pretty.string_of (Pretty.block (Pretty.breaks
+ (map Pretty.str ("roots:" :: roots)))));
+ writeln (string_of_big_list "prods:" (pretty_gram gram))
end;
-val print_gram = prt_gram o xgram_of;
-
(* print_trans *)
-fun prt_trans (XGram xgram) =
+fun print_trans (Syntax tabs) =
let
- fun string_of_trs name trs = string_of_strings name (map fst trs);
+ fun string_of_trtab name tab =
+ string_of_strings name (map fst (dest_trtab tab));
- fun string_of_rules name rules =
- string_of_big_list name (map pretty_rule rules);
+ fun string_of_ruletab name tab =
+ string_of_big_list name (map pretty_rule (dest_ruletab tab));
- val {consts, parse_ast_translation, parse_rules, parse_translation,
- print_translation, print_rules, print_ast_translation, ...} = xgram;
+ val {consts, parse_ast_trtab, parse_ruletab, parse_trtab, print_trtab,
+ print_ruletab, print_ast_trtab, ...} = tabs;
in
writeln (string_of_strings "consts:" consts);
- writeln (string_of_trs "parse_ast_translation:" parse_ast_translation);
- writeln (string_of_rules "parse_rules:" parse_rules);
- writeln (string_of_trs "parse_translation:" parse_translation);
- writeln (string_of_trs "print_translation:" print_translation);
- writeln (string_of_rules "print_rules:" print_rules);
- writeln (string_of_trs "print_ast_translation:" print_ast_translation)
+ writeln (string_of_trtab "parse_ast_translation:" parse_ast_trtab);
+ writeln (string_of_ruletab "parse_rules:" parse_ruletab);
+ writeln (string_of_trtab "parse_translation:" parse_trtab);
+ writeln (string_of_trtab "print_translation:" print_trtab);
+ writeln (string_of_ruletab "print_rules:" print_ruletab);
+ writeln (string_of_trtab "print_ast_translation:" print_ast_trtab)
end;
-val print_trans = prt_trans o xgram_of;
-
(* print_syntax *)
-fun print_syntax syn =
- let
- val xgram = xgram_of syn;
- in
- prt_gram xgram; prt_trans xgram
- end;
+fun print_syntax syn = (print_gram syn; print_trans syn);
-(*** parsing and printing ***)
-
-(* mk_get_rules *)
-
-fun mk_get_rules ruletab =
- let
- fun get_rules a =
- (case lookup ruletab a of
- Some rules => rules
- | None => []);
- in
- if Symtab.is_null ruletab then None else Some get_rules
- end;
-
+(** read **)
(* read_ast *)
-fun read_ast (Syntax (_, tabs)) xids root str =
+fun read_ast (Syntax tabs) xids root str =
let
- val Tabs {lexicon, gram, parse_ast_trtab, ...} = tabs;
+ val {lexicon, gram, parse_ast_trtab, ...} = tabs;
in
- pt_to_ast (lookup parse_ast_trtab)
+ pt_to_ast (lookup_trtab parse_ast_trtab)
(parse gram root (tokenize lexicon xids str))
end;
-
-(** test_read **)
+(* test_read *)
-fun test_read (Syntax (_, tabs)) root str =
+fun test_read (Syntax tabs) root str =
let
- val Tabs {lexicon, gram, parse_ast_trtab, parse_ruletab, ...} = tabs;
+ val {lexicon, gram, parse_ast_trtab, parse_ruletab, ...} = tabs;
val toks = tokenize lexicon false str;
val _ = writeln ("tokens: " ^ space_implode " " (map display_token toks));
@@ -331,36 +270,38 @@
val raw_ast = pt_to_ast (K None) pt;
val _ = writeln ("raw: " ^ str_of_ast raw_ast);
- val pre_ast = pt_to_ast (lookup parse_ast_trtab) pt;
- val _ = normalize true true (mk_get_rules parse_ruletab) pre_ast;
+ val pre_ast = pt_to_ast (lookup_trtab parse_ast_trtab) pt;
+ val _ = normalize true true (lookup_ruletab parse_ruletab) pre_ast;
in () end;
-
-(** read **)
+(* read *)
-fun read (syn as Syntax (_, tabs)) ty str =
+fun read (syn as Syntax tabs) ty str =
let
- val Tabs {parse_ruletab, parse_trtab, ...} = tabs;
+ val {parse_ruletab, parse_trtab, ...} = tabs;
val ast = read_ast syn false (typ_to_nonterm ty) str;
in
- ast_to_term (lookup parse_trtab)
- (normalize_ast (mk_get_rules parse_ruletab) ast)
+ ast_to_term (lookup_trtab parse_trtab)
+ (normalize_ast (lookup_ruletab parse_ruletab) ast)
end;
+(* read types *)
-(** read_typ **)
+fun read_typ syn def_sort str =
+ typ_of_term def_sort (read syn typeT str);
-fun read_typ syn def_sort str = typ_of_term def_sort (read syn typeT str);
+val type_syn = extend_syntax empty_syntax type_ext;
+
+fun simple_read_typ str = read_typ type_syn (K []) str;
-
-(** read_rule **)
+(* read rules *)
fun read_rule syn (xrule as ((_, lhs_src), (_, rhs_src))) =
let
- val Syntax (_, Tabs {consts, ...}) = syn;
+ val Syntax {consts, ...} = syn;
fun constantify (ast as Constant _) = ast
| constantify (ast as Variable x) =
@@ -381,10 +322,6 @@
| None => rule)
end;
-
-
-(** read_xrules **)
-
fun read_xrules syn xrules =
let
fun right_rule (xpat1 |-> xpat2) = Some (xpat1, xpat2)
@@ -403,12 +340,13 @@
(** pretty terms or typs **)
-fun pretty_t t_to_ast pretty_t (syn as Syntax (_, tabs)) t =
+fun pretty_t t_to_ast pretty_t (syn as Syntax tabs) t =
let
- val Tabs {print_trtab, print_ruletab, prtab, ...} = tabs;
- val ast = t_to_ast (lookup print_trtab) t;
+ val {print_trtab, print_ruletab, print_ast_trtab, prtab, ...} = tabs;
+ val ast = t_to_ast (lookup_trtab print_trtab) t;
in
- pretty_t prtab (normalize_ast (mk_get_rules print_ruletab) ast)
+ pretty_t prtab (lookup_trtab print_ast_trtab)
+ (normalize_ast (lookup_ruletab print_ruletab) ast)
end;
val pretty_term = pretty_t term_to_ast pretty_term_ast;
@@ -421,45 +359,32 @@
-(*** build syntax ***)
-
-(* type_syn *)
-
-val type_syn = mk_syntax (ref (ExtGG (ref EmptyGG, type_ext)));
+(** build syntax **)
-
-(* extend *) (* FIXME *)
-
-fun extend syn read_ty (roots, xconsts, sext) =
- let
- val Syntax (ggr0, tabs0 as Tabs {roots = roots0, ...}) = syn;
+(* extend *)
- val ext1 = ext_of_sext ((distinct roots) \\ roots0) xconsts read_ty sext;
+fun extend syn0 read_ty (all_roots, xconsts, sext) =
+ let
+ val Syntax {roots, ...} = syn0;
- val (syn1 as Syntax (ggr1, tabs1)) =
- (case ext1 of
- Ext {roots = [], mfix = [], ...} =>
- Syntax (ref (ExtGG (ggr0, ext1)), extend_tables tabs0 (mk_xgram ext1))
- | _ => mk_syntax (ref (ExtGG (ggr0, ext1))));
+ val syn1 = extend_syntax syn0
+ (syn_ext_of_sext (all_roots \\ roots) xconsts read_ty sext);
- val (parse_rules, print_rules) = read_xrules syn1 (xrules_of sext);
- val ext2 = ExtRules {parse_rules = parse_rules, print_rules = print_rules};
- in
- Syntax (ref (ExtGG (ggr1, ext2)), extend_tables tabs1 (mk_xgram ext2))
- end;
+ val syn2 = extend_syntax syn1
+ (syn_ext_rules (read_xrules syn1 (xrules_of sext)));
+ in syn2 end;
(* merge *)
-fun merge roots syn1 syn2 =
+fun merge all_roots syn1 syn2 =
let
- val Syntax (ggr1, Tabs {roots = roots1, ...}) = syn1;
- val Syntax (ggr2, Tabs {roots = roots2, ...}) = syn2;
- val mggr = ref (MergeGG (ggr1, ggr2));
+ val syn as (Syntax {roots, ...}) = merge_syntaxes syn1 syn2;
in
- (case ((distinct roots) \\ roots1) \\ roots2 of
- [] => mk_syntax mggr
- | new_roots => mk_syntax (ref (ExtGG (mggr, ExtRoots new_roots))))
+ (case all_roots \\ roots of
+ [] => syn
+ | new_roots => (writeln (string_of_strings "DEBUG new roots:" new_roots); (* FIXME debug *)
+ extend_syntax syn (syn_ext_roots new_roots)))
end;