Changeset 2310
- Timestamp:
- Feb 11, 2010 12:38:44 AM (11 years ago)
- Location:
- coopr.pyomo/trunk/coopr/pyomo
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.pyomo/trunk/coopr/pyomo/data/parse_datacmds.py
r2307 r2310 53 53 # "RANGE", 54 54 "WORD", 55 "WORDWITHINDEX", 55 56 "STRING", 56 57 "QUOTEDSTRING", … … 86 87 #_comment_list.append(t.value) 87 88 89 def t_WORDWITHINDEX(t): 90 r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\[[a-zA-Z_0-9\.\-,\*]*\]' 91 t.type = reserved.get(t.value,'WORDWITHINDEX') # Check for reserved words 92 return t 93 88 94 def t_WORD(t): 89 r'[a-zA-Z_0-9][a-zA-Z_0-9\. ]*'95 r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*' 90 96 t.type = reserved.get(t.value,'WORD') # Check for reserved words 91 97 return t … … 133 139 | SET WORD COLON items COLONEQ setdecl SEMICOLON 134 140 | SET WORD COLON items COLONEQ SEMICOLON 135 | SET indexed_wordCOLONEQ setdecl SEMICOLON136 | SET indexed_wordCOLONEQ SEMICOLON141 | SET WORDWITHINDEX COLONEQ setdecl SEMICOLON 142 | SET WORDWITHINDEX COLONEQ SEMICOLON 137 143 | PARAM items COLONEQ paramdecl SEMICOLON 138 144 | IMPORT importdecl SEMICOLON … … 253 259 p[0] = [p[2]] 254 260 255 def p_indexed_word(p):256 '''indexed_word : WORD LBRACKET WORD index_list RBRACKET257 | WORD LBRACKET ASTERISK index_list RBRACKET258 | WORD LBRACKET WORD RBRACKET259 | WORD LBRACKET ASTERISK RBRACKET260 '''261 if len(p) == 6:262 p[0] = p[1]+p[2]+",".join([p[3]]+p[4])+p[5]263 else:264 p[0] = p[1]+p[2]+p[3]+p[4]265 266 261 def p_template(p): 267 262 '''template : LPAREN WORD index_list RPAREN … … 285 280 def p_item(p): 286 281 '''item : WORD 282 | WORDWITHINDEX 287 283 | NONWORD 288 284 | STRING … … 295 291 | LPAREN 296 292 | RPAREN 297 | indexed_word293 | ASTERISK 298 294 | template 299 295 ''' -
coopr.pyomo/trunk/coopr/pyomo/tests/unit/data8.dat
r2309 r2310 1 1 param A := False; 2 2 param B := True; 3 #set Z := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ; 3 set Z := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ; 4 set Z[A] := foo[*] bar [ * ] bar[1,*,a,*] foo-bar hello-goodbye ;
Note: See TracChangeset
for help on using the changeset viewer.