Ignore:
Timestamp:
2018-12-01T22:33:38+01:00 (5 months ago)
Author:
Don-vip
Message:

fix #17053 - ignore MapCSS declarations starting with "-" to allow external extensions (used by osmose)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

    r12987 r14481  
    166166{
    167167    < IDENT: ["a"-"z","A"-"Z","_"] ( ["a"-"z","A"-"Z","_","-","0"-"9"] )* >
     168|   < EXTIDENT: <MINUS> <IDENT> >
    168169|   < UINT: ( ["0"-"9"] )+ >
    169170|   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
     
    283284{
    284285    (
    285         (t=<PP_AND> | t=<PP_OR> | t=<PP_NOT> | t=<UINT> | t=<STRING> | t=<REGEX> | t=<LPAR> | t=<RPAR> | t=<COMMA> | t=<COLON> | t=<IDENT> | t=<PP_SOMETHING_ELSE>) { if (write) sb.append(t.image); }
     286        (t=<PP_AND> | t=<PP_OR> | t=<PP_NOT> | t=<UINT> | t=<STRING> | t=<REGEX> | t=<LPAR> | t=<RPAR> | t=<COMMA> | t=<COLON> | t=<IDENT> | t=<EXTIDENT> | t=<PP_SOMETHING_ELSE>) { if (write) sb.append(t.image); }
    286287        |
    287288            pp_w1()
     
    906907        )
    907908    |
     909        <EXTIDENT> w() <COLON> w() expression() <SEMICOLON> w()
     910    |
    908911        key=<IDENT> w() <COLON> w()
    909912        (
Note: See TracChangeset for help on using the changeset viewer.