Changeset 8331 in josm for trunk

Timestamp:

2015-05-05T22:08:03+02:00 (9 years ago)

Author:

simon04

Message:

fix #10278 - MapCSSTagChecker: preprocess MapCSS for media queries support

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -8 +8 @@
 import java.io.InputStream;
 import java.io.Reader;
+import java.io.StringReader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -317 +318 @@
         static List<TagCheck> readMapCSS(Reader css) throws ParseException {
             CheckParameterUtil.ensureParameterNotNull(css, "css");
-            return readMapCSS(new MapCSSParser(css));
-        }
-
-        static List<TagCheck> readMapCSS(MapCSSParser css) throws ParseException {
-            CheckParameterUtil.ensureParameterNotNull(css, "css");
+
             final MapCSSStyleSource source = new MapCSSStyleSource("");
-            css.sheet(source);
+            final MapCSSParser preprocessor = new MapCSSParser(css, MapCSSParser.LexicalState.PREPROCESSOR);
+
+            css = new StringReader(preprocessor.pp_root(source));
+            final MapCSSParser parser = new MapCSSParser(css, MapCSSParser.LexicalState.DEFAULT);
+            parser.sheet(source);
             assert source.getErrors().isEmpty();
             // Ignore "meta" rule(s) from external rules of JOSM wiki

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

@@ -9 +9 @@
 
 import java.io.InputStream;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -87 +88 @@
             throw new RuntimeException(e);
         }
+        return new MapCSSParserTokenManager(scs, initState.idx);
+    }
+
+    /**
+     * Constructor which initializes the parser with a certain lexical state.
+     */
+    public MapCSSParser(Reader in, LexicalState initState) {
+        this(createTokenManager(in, initState));
+        declarationCounter = 0;
+    }
+
+    protected static MapCSSParserTokenManager createTokenManager(Reader in, LexicalState initState) {
+        final SimpleCharStream scs = new SimpleCharStream(in, 1, 1);
         return new MapCSSParserTokenManager(scs, initState.idx);
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -118 +118 @@
 
     @Test
+    public void testPreprocessing() throws Exception {
+        final MapCSSTagChecker test = buildTagChecker("" +
+                "@media (min-josm-version: 1) { *[foo] { throwWarning: \"!\"; } }\n" +
+                "@media (min-josm-version: 2147483647) { *[bar] { throwWarning: \"!\"; } }\n");
+        assertThat(test.getErrorsForPrimitive(OsmUtils.createPrimitive("way foo=1"), false).size(), is(1));
+        assertThat(test.getErrorsForPrimitive(OsmUtils.createPrimitive("way bar=1"), false).size(), is(0));
+    }
+
+    @Test
     public void testInit() throws Exception {
         MapCSSTagChecker c = new MapCSSTagChecker();