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

Timestamp:

2014-05-05T13:26:03+02:00 (10 years ago)

Author:

bastiK

Message:

see #9691 - add back reverted optimization [7056] (modified so it is thread safe)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (11 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;
@@ -48 +49 @@
     MapCSSStyleSource sheet;
     StringBuilder sb;
+    int declarationCounter;
 
     /**
@@ -71 +73 @@
     public MapCSSParser(InputStream in, String encoding, LexicalState initState) {
         this(createTokenManager(in, encoding, initState));
+        declarationCounter = 0;
     }
 
@@ -469 +472 @@
 void sheet(MapCSSStyleSource sheet):
 {
-    MapCSSRule r;
 }
 {
@@ -476 +478 @@
     (
         try {
-            r=rule() { if (r != null) { sheet.rules.add(r); } } w()
+            rule() w()
         } catch (MapCSSException mex) {
             error_skipto(RBRACE, mex);
@@ -488 +490 @@
 }
 
-MapCSSRule rule():
+void rule():
 {
     List<Selector> selectors = new ArrayList<Selector>();
     Selector sel;
-    List<Instruction> decl;
+    Declaration decl;
 }
 {
@@ -501 +503 @@
     )*
     decl=declaration()
-    { return new MapCSSRule(selectors, decl); }
+    { 
+        for (Selector s : selectors) {
+            sheet.rules.add(new MapCSSRule(s, decl));
+        }
+    }
 }
 
@@ -707 +713 @@
 }
 
-List<Instruction> declaration() :
+Declaration declaration() :
 {
     List<Instruction> ins = new ArrayList<Instruction>();
@@ -723 +729 @@
             ( <EQUAL> val=expression() )?
             { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val, true)); }
-            ( <RBRACE> { return ins; } | <SEMICOLON> w() )
+            ( <RBRACE> { return new Declaration(ins, declarationCounter++); } | <SEMICOLON> w() )
         )
     |
@@ -732 +738 @@
                 { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 w()
-                ( <RBRACE> { return ins; } | <SEMICOLON> w() )
+                ( <RBRACE> { return new Declaration(ins, declarationCounter++); } | <SEMICOLON> w() )
             |
             LOOKAHEAD( expression() ( <SEMICOLON> | <RBRACE> ) )
                 val=expression()
                 { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
-                ( <RBRACE> { return ins; } | <SEMICOLON> w() )
+                ( <RBRACE> { return new Declaration(ins, declarationCounter++); } | <SEMICOLON> w() )
             |
                 val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
@@ -743 +749 @@
     )*
     <RBRACE>
-    { return ins; }
+    { return new Declaration(ins, declarationCounter++); }
 }