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

Timestamp:

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

Author:

simon04

Message:

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

File:

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

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);
     }