Mercurial Mercurial > repos > isabelle / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/HOL/SPARK/Tools/fdl_parser.ML
changeset 49998 ad8a6db0b480
parent 48911 5debc3e4fa81 
--- a/src/HOL/SPARK/Tools/fdl_parser.ML	Thu Nov 01 15:00:48 2012 +0100
+++ b/src/HOL/SPARK/Tools/fdl_parser.ML	Fri Nov 02 12:00:51 2012 +0100
@@ -166,6 +166,8 @@
 val quantification_generator =
   list1 identifier --| $$$ ":" -- identifier;
 
+fun opt_parens p = $$$ "(" |-- p --| $$$ ")" || p;
+
 fun expression xs = group "expression"
   (binop disjunction ($$$ "->" || $$$ "<->")) xs
 
@@ -214,14 +216,14 @@
   (list1 (identifier --| $$$ ":=" -- !!! expression) >> (pair s #> Record)) xs
 
 and array_args s xs =
-  (   expression -- Scan.optional ($$$ "," |-- !!! array_associations) [] >>
-        (fn (default, assocs) => Array (s, SOME default, assocs))
-   || array_associations >> (fn assocs => Array (s, NONE, assocs))) xs
+  (   array_associations >> (fn assocs => Array (s, NONE, assocs))
+   || expression -- Scan.optional ($$$ "," |-- !!! array_associations) [] >>
+        (fn (default, assocs) => Array (s, SOME default, assocs))) xs
 
 and array_associations xs =
-  (list1 (enum1 "&" ($$$ "[" |--
+  (list1 (opt_parens (enum1 "&" ($$$ "[" |--
      !!! (list1 (expression -- Scan.option ($$$ ".." |-- !!! expression)) --|
-       $$$ "]")) --| $$$ ":=" -- expression)) xs;
+       $$$ "]"))) --| $$$ ":=" -- expression)) xs;
 
 
 (* verification conditions *)
isabelle