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

Timestamp:

2014-05-04T12:55:06+02:00 (12 years ago)

Author:

bastiK

Message:

reverting [7056] because it won't work for execution in multiple threads (which will be more useful)

File:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule.Declaration;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -470 +469 @@
 void sheet(MapCSSStyleSource sheet):
 {
+    MapCSSRule r;
 }
 {
@@ -476 +476 @@
     (
         try {
-            rule() w()
+            r=rule() { if (r != null) { sheet.rules.add(r); } } w()
         } catch (MapCSSException mex) {
             error_skipto(RBRACE, mex);
@@ -488 +488 @@
 }
 
-void rule():
+MapCSSRule rule():
 {
     List<Selector> selectors = new ArrayList<Selector>();
     Selector sel;
-    Declaration decl;
+    List<Instruction> decl;
 }
 {
@@ -501 +501 @@
     )*
     decl=declaration()
-    { 
-        for (Selector s : selectors) {
-            sheet.rules.add(new MapCSSRule(s, decl));
-        }
-    }
+    { return new MapCSSRule(selectors, decl); }
 }
 
@@ -711 +707 @@
 }
 
-Declaration declaration() :
+List<Instruction> declaration() :
 {
     List<Instruction> ins = new ArrayList<Instruction>();
@@ -727 +723 @@
             ( <EQUAL> val=expression() )?
             { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val, true)); }
-            ( <RBRACE> { return new Declaration(ins); } | <SEMICOLON> w() )
+            ( <RBRACE> { return ins; } | <SEMICOLON> w() )
         )
     |
@@ -736 +732 @@
                 { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 w()
-                ( <RBRACE> { return new Declaration(ins); } | <SEMICOLON> w() )
+                ( <RBRACE> { return ins; } | <SEMICOLON> w() )
             |
             LOOKAHEAD( expression() ( <SEMICOLON> | <RBRACE> ) )
                 val=expression()
                 { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
-                ( <RBRACE> { return new Declaration(ins); } | <SEMICOLON> w() )
+                ( <RBRACE> { return ins; } | <SEMICOLON> w() )
             |
                 val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
@@ -747 +743 @@
     )*
     <RBRACE>
-    { return new Declaration(ins); }
+    { return ins; }
 }