# HG changeset patch
# User wenzelm
# Date 1430481486 -7200
# Node ID c0f686b39ebb3343ec195b5811be24e107edd001
# Parent  3bcd15f14dcbd0c30dfbd9758070b56553a5eb85
modifier markup for all parsed tokens;
report literal token markup, before re-assignment;

diff -r 3bcd15f14dcb -r c0f686b39ebb src/Pure/Isar/method.ML
--- a/src/Pure/Isar/method.ML	Fri May 01 00:27:04 2015 +0200
+++ b/src/Pure/Isar/method.ML	Fri May 01 13:58:06 2015 +0200
@@ -511,11 +511,11 @@
 local
 
 fun sect (modifier : modifier parser) = Scan.depend (fn context =>
-  Scan.ahead Parse.not_eof -- modifier -- Scan.repeat (Scan.unless modifier Parse.xthm) >>
-    (fn ((tok, {init, attribute, pos}), xthms) =>
+  Scan.ahead Parse.not_eof -- Scan.trace modifier -- Scan.repeat (Scan.unless modifier Parse.xthm)
+    >> (fn ((tok0, ({init, attribute, pos}, modifier_toks)), xthms) =>
       let
         val decl =
-          (case Token.get_value tok of
+          (case Token.get_value tok0 of
             SOME (Token.Declaration decl) => decl
           | _ =>
               let
@@ -530,14 +530,19 @@
                 val facts =
                   Attrib.partial_evaluation ctxt [((Binding.name "dummy", []), thms)]
                   |> map (fn (_, bs) => ((Binding.empty, [Attrib.internal (K attribute)]), bs));
-                val _ =
-                  Context_Position.report ctxt (Token.pos_of tok)
-                    (Markup.entity Markup.method_modifierN ""
-                      |> Markup.properties (Position.def_properties_of pos));
+
                 fun decl phi =
                   Context.mapping I init #>
                   Attrib.generic_notes "" (Attrib.transform_facts phi facts) #> snd;
-                val _ = Token.assign (SOME (Token.Declaration decl)) tok;
+
+                val modifier_markup =
+                  Markup.properties (Position.def_properties_of pos)
+                    (Markup.entity Markup.method_modifierN "");
+                val _ =
+                  Context_Position.reports ctxt
+                    (map (fn tok => (Token.pos_of tok, modifier_markup)) modifier_toks @
+                      Token.reports_of_value tok0);
+                val _ = Token.assign (SOME (Token.Declaration decl)) tok0;
               in decl end);
       in (Morphism.form decl context, decl) end));
 
diff -r 3bcd15f14dcb -r c0f686b39ebb src/Pure/Isar/token.ML
--- a/src/Pure/Isar/token.ML	Fri May 01 00:27:04 2015 +0200
+++ b/src/Pure/Isar/token.ML	Fri May 01 13:58:06 2015 +0200
@@ -396,8 +396,18 @@
 fun map_value f (Token (x, y, Value (SOME v))) = Token (x, y, Value (SOME (f v)))
   | map_value _ tok = tok;
 
+fun map_values f =
+  (map_args o map_value) (fn Source src => Source (map_values f src) | x => f x);
+
+
+(* reports of value *)
+
+fun get_assignable_value (Token (_, _, Assignable r)) = ! r
+  | get_assignable_value (Token (_, _, Value v)) = v
+  | get_assignable_value _ = NONE;
+
 fun reports_of_value tok =
-  (case get_value tok of
+  (case get_assignable_value tok of
     SOME (Literal markup) =>
       let
         val pos = pos_of tok;
@@ -409,9 +419,6 @@
       end
   | _ => []);
 
-fun map_values f =
-  (map_args o map_value) (fn Source src => Source (map_values f src) | x => f x);
-
 
 (* maxidx *)