Fix parse error with MAD-X ARRAYs

hibtc · Apr 29, 2014 · 46fc609 · 46fc609
1 parent 58777c4
commit 46fc609
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/madseq.py b/madseq.py
@@ -111,7 +111,8 @@ class regex(object):
     thingy = Re(r'(?:[^\s,;!]+)')
     identifier = Re(r'(?:[a-zA-Z][\w\.]*)')
     string = Re(r'(?:"[^"]*")')
-    param = Re(r'(?:',string,'|',thingy,')')
+    array = Re(r'(?:\{[^\}]*\})')
+    param = Re(r'(?:',string,'|',array,'|',thingy,')')
     cmd = Re(r'^\s*(?:(',identifier,r')\s*:)?\s*(',identifier,r')\s*(,.*)?;\s*$')
     arg = Re(r',\s*(',identifier,r')\s*(:?=)\s*(',param,')')