# HG changeset patch
# User wenzelm
# Date 1214680875 -7200
# Node ID b1285021424ee985ee43577703fc87289dfaf648
# Parent  19ae7064f00fc1539bfa10e8bf8323cc4ca49942
tuned nested args parser;
export generic_args1;

diff -r 19ae7064f00f -r b1285021424e src/Pure/Isar/args.ML
--- a/src/Pure/Isar/args.ML	Sat Jun 28 21:21:13 2008 +0200
+++ b/src/Pure/Isar/args.ML	Sat Jun 28 21:21:15 2008 +0200
@@ -89,6 +89,7 @@
   val bang_facts: Context.generic * T list -> thm list * (Context.generic * T list)
   val goal_spec: ((int -> tactic) -> tactic) -> ('a * T list)
     -> ((int -> tactic) -> tactic) * ('a * T list)
+  val generic_args1: (string -> bool) -> T list -> T list * T list
   val attribs: (string -> string) -> T list -> src list * T list
   val opt_attribs: (string -> string) -> T list -> src list * T list
   val thm_name: (string -> string) -> string -> T list -> (string * src list) * T list
@@ -366,8 +367,6 @@
 
 (* goal specification *)
 
-(* range *)
-
 val from_to =
   nat -- ($$$ "-" |-- nat) >> (fn (i, j) => fn tac => Seq.INTERVAL tac i j) ||
   nat --| $$$ "-" >> (fn i => fn tac => fn st => Seq.INTERVAL tac i (Thm.nprems_of st) st) ||
@@ -378,31 +377,34 @@
 fun goal_spec def = Scan.lift (Scan.optional goal def);
 
 
-
-(* attribs *)
+(* nested args and attribs *)
 
 local
 
-val exclude = member (op =) (explode "()[],");
-
-fun atomic blk = touch (Scan.one (fn Arg ((k, x, _), _) =>
-    k <> Keyword orelse not (exclude x) orelse blk andalso x = ","));
+fun parse_args is_symid =
+  let
+    fun atom blk = touch (Scan.one (fn Arg ((k, x, _), _) =>
+      k <> Keyword orelse is_symid x orelse blk andalso x = ","));
 
-fun args blk x = Scan.optional (args1 blk) [] x
-and args1 blk x =
-  ((Scan.repeat1
-    (Scan.repeat1 (atomic blk) ||
-      argsp "(" ")" ||
-      argsp "[" "]")) >> flat) x
-and argsp l r x =
-  (Scan.trace (&&& l -- !!! (args true -- &&& r)) >> #2) x;
+    fun args blk x = Scan.optional (args1 blk) [] x
+    and args1 blk x =
+      ((Scan.repeat1
+        (Scan.repeat1 (atom blk) ||
+          argsp "(" ")" ||
+          argsp "[" "]")) >> flat) x
+    and argsp l r x =
+      (Scan.trace (&&& l -- !!! (args true -- &&& r)) >> #2) x;
+  in (args, args1) end;
 
 in
 
+fun generic_args1 is_symid = #2 (parse_args is_symid) false;
+val arguments = #1 (parse_args OuterLex.is_sid) false;
+
 fun attribs intern =
   let
     val attrib_name = internal_text || (symbolic || named) >> evaluate Text intern;
-    val attrib = position (attrib_name -- !!! (args false)) >> src;
+    val attrib = position (attrib_name -- !!! arguments) >> src;
   in $$$ "[" |-- !!! (list attrib --| $$$ "]") end;
 
 fun opt_attribs intern = Scan.optional (attribs intern) [];
@@ -417,7 +419,9 @@
   Scan.optional ((name -- opt_attribs intern || attribs intern >> pair "") --| $$$ s) ("", []);
 
 
-(* syntax interface *)
+
+
+(** syntax wrapper **)
 
 fun syntax kind scan (src as Src ((s, args), pos)) st =
   (case Scan.error (Scan.finite' stopper (Scan.option scan)) (st, args) of