# HG changeset patch
# User wenzelm
# Date 1517309318 -3600
# Node ID 71b36ff8f94de828c42015877f6693299047488c
# Parent  d19686205f8684ad961bcb04ec72dd7e58fecf53
clarified modules;
tuned;

diff -r d19686205f86 -r 71b36ff8f94d src/Pure/Syntax/lexicon.ML
--- a/src/Pure/Syntax/lexicon.ML	Tue Jan 30 11:20:52 2018 +0100
+++ b/src/Pure/Syntax/lexicon.ML	Tue Jan 30 11:48:38 2018 +0100
@@ -37,7 +37,6 @@
   val literal_markup: string -> Markup.T
   val report_of_token: token -> Position.report
   val reported_token_range: Proof.context -> token -> string
-  val matching_tokens: token * token -> bool
   val valued_token: token -> bool
   val predef_term: string -> token option
   val implode_string: Symbol.symbol list -> string
@@ -180,12 +179,6 @@
   else "";
 
 
-(* matching_tokens *)
-
-fun matching_tokens (Token (Literal, x, _), Token (Literal, y, _)) = x = y
-  | matching_tokens (Token (k, _, _), Token (k', _, _)) = k = k';
-
-
 (* valued_token *)
 
 val valued_token =
diff -r d19686205f86 -r 71b36ff8f94d src/Pure/Syntax/parser.ML
--- a/src/Pure/Syntax/parser.ML	Tue Jan 30 11:20:52 2018 +0100
+++ b/src/Pure/Syntax/parser.ML	Tue Jan 30 11:48:38 2018 +0100
@@ -77,8 +77,13 @@
      lambda productions are stored as normal productions
      and also as an entry in "lambdas"*)
 
-val union_token = union Lexicon.matching_tokens;
-val subtract_token = subtract Lexicon.matching_tokens;
+fun tokens_match toks =
+  (case apply2 Lexicon.kind_of_token toks of
+    (Lexicon.Literal, Lexicon.Literal) => op = (apply2 Lexicon.str_of_token toks)
+  | kinds => op = kinds);
+
+val tokens_union = union tokens_match;
+val tokens_subtract = subtract tokens_match;
 
 (*productions for which no starting token is
   known yet are associated with this token*)
@@ -173,10 +178,10 @@
 
                                 val new_tks =
                                   (if is_some tk then [the tk] else [])
-                                  |> fold (union_token o starts_for_nt) nts
+                                  |> fold (tokens_union o starts_for_nt) nts
                                   |> subtract (op =) l_starts;
 
-                                val added_tks' = union_token added_tks new_tks;
+                                val added_tks' = tokens_union added_tks new_tks;
 
                                 val nt_dependencies' = union (op =) nts nt_dependencies;
 
@@ -262,7 +267,7 @@
 
               val start_tks =
                 (if is_some start_tk then [the start_tk] else [])
-                |> fold (union_token o starts_for_nt) start_nts;
+                |> fold (tokens_union o starts_for_nt) start_nts;
 
               val opt_starts =
                (if is_some new_lambdas then [NONE]
@@ -284,7 +289,7 @@
                     let
                       val ((old_nts, old_tks), nt_prods) = Array.sub (prods, nt);
 
-                      val new_tks = subtract_token old_tks start_tks;
+                      val new_tks = tokens_subtract old_tks start_tks;
 
                       (*store new production*)
                       fun store [] prods is_new =
@@ -398,7 +403,7 @@
                                 AList.update (op =) (key, tk_prods') nt_prods'
                               else nt_prods';
 
-                            val added_tks = subtract_token old_tks new_tks;
+                            val added_tks = tokens_subtract old_tks new_tks;
                           in
                             if null added_tks then
                               (Array.update (prods, nt, (lookahead, nt_prods''));
@@ -629,7 +634,7 @@
       let
         fun assoc [] result = result
           | assoc ((keyi, pi) :: pairs) result =
-              if is_some keyi andalso Lexicon.matching_tokens (the keyi, key)
+              if is_some keyi andalso tokens_match (the keyi, key)
                  orelse include_none andalso is_none keyi then
                 assoc pairs (pi @ result)
               else assoc pairs result;
@@ -673,8 +678,7 @@
               end
           | (_, _, _, Terminal a :: _, _, _) => (*scanner operation*)
               processS used States
-                (S :: Si,
-                  if Lexicon.matching_tokens (a, c) then movedot_term c S :: Sii else Sii)
+                (S :: Si, if tokens_match (a, c) then movedot_term c S :: Sii else Sii)
           | (A, prec, ts, [], id, j) => (*completer operation*)
               let val tt = if id = "" then ts else [Node (id, rev ts)] in
                 if j = i then (*lambda production?*)