Changeset 6686 in josm for trunk

Timestamp:

2014-01-15T01:18:13+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9575 - support predefined character classes in MapCSS regular expressions (\d, \D, \s, \S, \w, \W)

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (1 diff)

trunk/build.xml

@@ -200 +200 @@
             <arg value="-JDK_VERSION=1.6"/>
             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
-            <arg value="-UNICODE_INPUT"/>
             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
             <arg value="${mapcss.dir}/MapCSSParser.jj"/>

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

@@ -47 +47 @@
 |   < UFLOAT: ( ["0"-"9"] )+ ( "." ( ["0"-"9"] )+ )? >
 |   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
-|   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" >
+|   < #PREDEFINED: "\\" ["d","D","s","S","w","W"] >
+|   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" | <PREDEFINED> >
 |   < REGEX: "/" <REGEX_CHAR_WITHOUT_STAR> ( <REGEX_CHAR_WITHOUT_STAR> | "*" )*  "/" >
 |   < #H: ["0"-"9","a"-"f","A"-"F"] >

trunk/styles/standard/elemstyles.xml

@@ -163 +163 @@
         <rule>
                 <condition k="access" b="no"/>
-        <linemod mode="under" width="+2" colour="no#ff8080" dashed="2"/>
+                <linemod mode="under" width="+2" colour="no#ff8080" dashed="2"/>
                 <icon src="vehicle/restriction/access.png" priority="-100"/>
         </rule>