Changeset 2310

Timestamp:

Feb 11, 2010 12:38:44 AM (9 years ago)

Author:

wehart

Message:

Generalizing parsing behavior for set strings.

Location:

coopr.pyomo/trunk/coopr/pyomo

Files:

• data/parse_datacmds.py (modified) (6 diffs)
• tests/unit/data8.dat (modified) (1 diff)

coopr.pyomo/trunk/coopr/pyomo/data/parse_datacmds.py

@@ -53 +53 @@
 #    "RANGE",
     "WORD",
+    "WORDWITHINDEX",
     "STRING",
     "QUOTEDSTRING",
@@ -86 +87 @@
     #_comment_list.append(t.value)
 
+def t_WORDWITHINDEX(t):
+    r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\[[a-zA-Z_0-9\.\-,\*]*\]'
+    t.type = reserved.get(t.value,'WORDWITHINDEX')    # Check for reserved words
+    return t
+
 def t_WORD(t):
-    r'[a-zA-Z_0-9][a-zA-Z_0-9\.]*'
+    r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*'
     t.type = reserved.get(t.value,'WORD')    # Check for reserved words
     return t
@@ -133 +139 @@
                  | SET WORD COLON items COLONEQ setdecl SEMICOLON
                  | SET WORD COLON items COLONEQ SEMICOLON
-                 | SET indexed_word COLONEQ setdecl SEMICOLON
-                 | SET indexed_word COLONEQ SEMICOLON
+                 | SET WORDWITHINDEX COLONEQ setdecl SEMICOLON
+                 | SET WORDWITHINDEX COLONEQ SEMICOLON
                  | PARAM items COLONEQ paramdecl SEMICOLON
                  | IMPORT importdecl SEMICOLON
@@ -253 +259 @@
         p[0] = [p[2]]
 
-def p_indexed_word(p):
-    '''indexed_word : WORD LBRACKET WORD index_list RBRACKET
-                    | WORD LBRACKET ASTERISK index_list RBRACKET
-                    | WORD LBRACKET WORD RBRACKET
-                    | WORD LBRACKET ASTERISK RBRACKET
-    '''
-    if len(p) == 6:
-        p[0] = p[1]+p[2]+",".join([p[3]]+p[4])+p[5]
-    else:
-        p[0] = p[1]+p[2]+p[3]+p[4]
-
 def p_template(p):
     '''template : LPAREN WORD index_list RPAREN
@@ -285 +280 @@
 def p_item(p):
     '''item : WORD
+            | WORDWITHINDEX
             | NONWORD
             | STRING
@@ -295 +291 @@
             | LPAREN
             | RPAREN
-            | indexed_word
+            | ASTERISK
             | template
     '''

coopr.pyomo/trunk/coopr/pyomo/tests/unit/data8.dat

@@ -1 +1 @@
 param A := False;
 param B := True;
-#set Z := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ;
+set Z := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ;
+set Z[A] := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ;