Changeset 3912 in josm
- Timestamp:
- 2011-02-18T19:37:37+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java
r3911 r3912 546 546 jj_consume_token(EQUAL); 547 547 op=Condition.Op.ONE_OF; 548 val = string_or_ident();549 548 break; 550 549 case CARET: … … 552 551 jj_consume_token(EQUAL); 553 552 op=Condition.Op.BEGINS_WITH; 554 val = string_or_ident();555 553 break; 556 554 case DOLLAR: … … 558 556 jj_consume_token(EQUAL); 559 557 op=Condition.Op.ENDS_WITH; 560 val = string_or_ident();561 558 break; 562 559 case STAR: … … 564 561 jj_consume_token(EQUAL); 565 562 op=Condition.Op.CONTAINS; 566 val = string_or_ident();567 563 break; 568 564 default: … … 1174 1170 if (jj_scan_token(DOLLAR)) return true; 1175 1171 if (jj_scan_token(EQUAL)) return true; 1176 if (jj_3R_56()) return true;1177 1172 return false; 1178 1173 } … … 1181 1176 if (jj_scan_token(CARET)) return true; 1182 1177 if (jj_scan_token(EQUAL)) return true; 1183 if (jj_3R_56()) return true;1184 1178 return false; 1185 1179 } … … 1188 1182 if (jj_scan_token(TILDE)) return true; 1189 1183 if (jj_scan_token(EQUAL)) return true; 1190 if (jj_3R_56()) return true;1191 1184 return false; 1192 1185 } … … 1248 1241 } 1249 1242 } 1243 return false; 1244 } 1245 1246 private boolean jj_3R_55() { 1247 if (jj_scan_token(COLON)) return true; 1248 if (jj_scan_token(IDENT)) return true; 1249 return false; 1250 } 1251 1252 private boolean jj_3R_56() { 1253 Token xsp; 1254 xsp = jj_scanpos; 1255 if (jj_3R_73()) { 1256 jj_scanpos = xsp; 1257 if (jj_3R_74()) return true; 1258 } 1259 return false; 1260 } 1261 1262 private boolean jj_3R_73() { 1263 if (jj_scan_token(IDENT)) return true; 1250 1264 return false; 1251 1265 } … … 1259 1273 } 1260 1274 1261 private boolean jj_3R_55() {1262 if (jj_scan_token(COLON)) return true;1263 if (jj_scan_token(IDENT)) return true;1264 return false;1265 }1266 1267 private boolean jj_3R_56() {1268 Token xsp;1269 xsp = jj_scanpos;1270 if (jj_3R_73()) {1271 jj_scanpos = xsp;1272 if (jj_3R_74()) return true;1273 }1274 return false;1275 }1276 1277 private boolean jj_3R_73() {1278 if (jj_scan_token(IDENT)) return true;1279 return false;1280 }1281 1282 1275 private boolean jj_3R_27() { 1283 1276 if (jj_3R_50()) return true; … … 1858 1851 if (jj_scan_token(STAR)) return true; 1859 1852 if (jj_scan_token(EQUAL)) return true; 1860 if (jj_3R_56()) return true;1861 1853 return false; 1862 1854 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj
r3911 r3912 354 354 <EQUAL> { op=Condition.Op.EQ; } 355 355 | 356 <TILDE> <EQUAL> { op=Condition.Op.ONE_OF; } val=string_or_ident()357 | 358 <CARET> <EQUAL> { op=Condition.Op.BEGINS_WITH; } val=string_or_ident()359 | 360 <DOLLAR> <EQUAL> { op=Condition.Op.ENDS_WITH; } val=string_or_ident()361 | 362 <STAR> <EQUAL> { op=Condition.Op.CONTAINS; } val=string_or_ident()356 <TILDE> <EQUAL> { op=Condition.Op.ONE_OF; } 357 | 358 <CARET> <EQUAL> { op=Condition.Op.BEGINS_WITH; } 359 | 360 <DOLLAR> <EQUAL> { op=Condition.Op.ENDS_WITH; } 361 | 362 <STAR> <EQUAL> { op=Condition.Op.CONTAINS; } 363 363 ) 364 364 s()
Note:
See TracChangeset
for help on using the changeset viewer.