src/Pure/Syntax/syn_ext.ML
changeset 5690 4b056ee5435c
parent 4938 c8bbbf3c59fa
child 5870 5d4fc952be47
--- a/src/Pure/Syntax/syn_ext.ML	Tue Oct 20 16:29:47 1998 +0200
+++ b/src/Pure/Syntax/syn_ext.ML	Tue Oct 20 16:30:27 1998 +0200
@@ -9,6 +9,7 @@
 sig
   val typeT: typ
   val constrainC: string
+  val max_pri: int
 end;
 
 signature SYN_EXT =
@@ -26,7 +27,6 @@
     Space of string |
     Bg of int | Brk of int | En
   datatype xprod = XProd of string * xsymb list * string * int
-  val max_pri: int
   val chain_pri: int
   val delims_of: xprod list -> string list list
   datatype mfix = Mfix of string * typ * string * int list * int
@@ -73,8 +73,6 @@
 structure SynExt : SYN_EXT =
 struct
 
-open Lexicon Ast;
-
 
 (** misc definitions **)
 
@@ -239,7 +237,7 @@
       | is_arg _ = false;
 
     fun is_term (Delim _) = true
-      | is_term (Argument (s, _)) = is_terminal s
+      | is_term (Argument (s, _)) = Lexicon.is_terminal s
       | is_term _ = false;
 
     fun rem_pri (Argument (s, _)) = Argument (s, chain_pri)
@@ -272,7 +270,7 @@
     check_pri pri;
     check_blocks symbs';
 
-    if is_terminal lhs' then err ("Illegal lhs: " ^ lhs')
+    if Lexicon.is_terminal lhs' then err ("Illegal lhs: " ^ lhs')
     else if const <> "" then xprod
     else if length (filter is_arg symbs') <> 1 then
       err "Copy production must have exactly one argument"
@@ -313,7 +311,7 @@
     SynExt {
       logtypes = logtypes',
       xprods = xprods,
-      consts = filter is_xid (consts union mfix_consts),
+      consts = filter Lexicon.is_xid (consts union mfix_consts),
       prmodes = distinct (map (fn (m, _, _) => m) tokentrfuns),
       parse_ast_translation = parse_ast_translation,
       parse_rules = parse_rules,