Changeset 3867 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj

Timestamp:

2011-02-07T16:05:37+01:00 (15 years ago)

Author:

bastiK

Message:

mapcss: parser improvements

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj

@@ -48 +48 @@
 |   < LPAR: "(" >
 |   < RPAR: ")" >
+|   < GREATER_EQUAL: ">=" >
+|   < LESS_EQUAL: "<=" >
+|   < GREATER: ">" >
+|   < LESS: "<" >
 |   < EQUAL: "=" >
 |   < EXCLAMATION: "!" >
@@ -188 +192 @@
     { this.sheet = sheet; }
     w()
-    ( r=rule() { sheet.rules.add(r); } w() )*
+    ( r=rule() { if (r != null) { sheet.rules.add(r); } } w() )*
     <EOF>
 }
@@ -199 +203 @@
 }
 {
-    sel=selector() { selectors.add(sel); } w()
-    (
-        <COMMA> w()
+    try {
         sel=selector() { selectors.add(sel); } w()
-    )*
+        (
+            <COMMA> w()
+            sel=selector() { selectors.add(sel); } w()
+        )*
+    } catch (ParseException ex) {
+        error_skipto(RBRACE);
+        return null;
+    }
     decl=declaration()
     { return new MapCSSRule(selectors, decl); }
@@ -298 +307 @@
 }
 {
-    <DCOLON>
+    ( <SLASH> | <DCOLON> )
     ( t=<IDENT> | t=<STAR> )
     { return t.image; }
@@ -354 +363 @@
 }
 {
-    e=primary() { args.add(e); } w()
     (
-            ( <PLUS> { op = "plus"; } w() e=primary() { args.add(e); } w() )+
-        |
-            ( <STAR> { op = "times"; } w() e=primary() { args.add(e); } w() )+
-        |
-            ( <MINUS> { op = "minus"; } w() e=primary() { args.add(e); } w() )+
-        |
-            ( <SLASH> { op = "divided_by"; } w() e=primary() { args.add(e); } w() )+
-        |
-            ( <AMPERSAND> <AMPERSAND> { op = "and"; } w() e=primary() { args.add(e); } w() )
-        |
-            ( <PIPE> <PIPE> { op = "or"; } w() e=primary() { args.add(e); } w() )
-        |
-            ( <QUESTION> { op = "cond"; } w() e=primary() { args.add(e); } w() <COLON> w() e=primary() { args.add(e); } w() )
-    )?
+        ( <EXCLAMATION> { op = "not"; } w() e=primary() { args.add(e); } w() )
+    |
+        ( <MINUS> { op = "minus"; } w() e=primary() { args.add(e); } w() )
+    |
+    
+        (
+            e=primary() { args.add(e); } w()
+            (
+                    ( <PLUS> { op = "plus"; } w() e=primary() { args.add(e); } w() )+
+                |
+                    ( <STAR> { op = "times"; } w() e=primary() { args.add(e); } w() )+
+                |
+                    ( <MINUS> { op = "minus"; } w() e=primary() { args.add(e); } w() )+
+                |
+                    ( <SLASH> { op = "divided_by"; } w() e=primary() { args.add(e); } w() )+
+                |
+                    ( <GREATER_EQUAL> { op = "greater_equal"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <LESS_EQUAL> { op = "less_equal"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <GREATER> { op = "greater"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <EQUAL> ( <EQUAL> )? { op = "equal"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <LESS> { op = "less"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <AMPERSAND> <AMPERSAND> { op = "and"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <PIPE> <PIPE> { op = "or"; } w() e=primary() { args.add(e); } w() )
+                |
+                    ( <QUESTION> { op = "cond"; } w() e=primary() { args.add(e); } w() <COLON> w() e=primary() { args.add(e); } w() )
+            )?
+        )
+    )
     {
         if (op == null)
@@ -420 +448 @@
     |
         ( <PLUS> f=ufloat() ) { return new Instruction.RelativeFloat(f); }
-    |
-        ( <MINUS> f=ufloat() ) { return -f; }
     |
         f=ufloat() { return f; }
@@ -447 +473 @@
     do {
         t = getNextToken();
-    } while (t.kind != kind);
-}
-
+    } while (t.kind != kind && t.kind != EOF);
+    if (t.kind == EOF)
+        throw new ParseException("Reached end of file while parsing");
+}
+