Changeset 7115 in josm

Timestamp:

2014-05-12T23:07:55+02:00 (9 years ago)

Author:

simon04

Message:

fix #9783 - MapCSS: allow to regexp-match name=(foo) by [name =~ /\(foo\)/]

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -134 +134 @@
 |   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
 |   < #PREDEFINED: "\\" ["d","D","s","S","w","W"] >
-|   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" | <PREDEFINED> >
+|   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" |  "\\(" | "\\)" |<PREDEFINED> >
 |   < REGEX: "/" <REGEX_CHAR_WITHOUT_STAR> ( <REGEX_CHAR_WITHOUT_STAR> | "*" )*  "/" >
 |   < LBRACE: "{" >

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -113 +113 @@
 
     @Test
+    public void testRegexConditionParenthesis() throws Exception {
+        def condition = (Condition.KeyValueCondition) getParser("[name =~ /^\\(foo\\)/]").condition(Condition.Context.PRIMITIVE)
+        assert condition.applies(getEnvironment("name", "(foo)"))
+        assert !condition.applies(getEnvironment("name", "foo"))
+        assert !condition.applies(getEnvironment("name", "((foo))"))
+    }
+
+    @Test
     public void testNegatedRegexCondition() throws Exception {
         def condition = (Condition.KeyValueCondition) getParser("[surface!~/paved|unpaved/]").condition(Condition.Context.PRIMITIVE)