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

Timestamp:

2014-01-03T17:14:36+01:00 (12 years ago)

Author:

simon04

Message:

see #9516 - Replace BuildingInBuilding by a corresponding MapCSS test

File:

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

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

@@ -472 +472 @@
             key=<IDENT> w()
             ( <EQUAL> val=expression() )?
-            { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val)); }
+            { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val, true)); }
             ( <RBRACE> { return ins; } | <SEMICOLON> w() )
         )
@@ -480 +480 @@
             LOOKAHEAD( float_array() w() ( <SEMICOLON> | <RBRACE> ) )
                 val=float_array()
-                { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 w()
                 ( <RBRACE> { return ins; } | <SEMICOLON> w() )
@@ -486 +486 @@
             LOOKAHEAD( expression() ( <SEMICOLON> | <RBRACE> ) )
                 val=expression()
-                { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
                 ( <RBRACE> { return ins; } | <SEMICOLON> w() )
             |
-                val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val)); }
+                val=readRaw() w() { ins.add(new Instruction.AssignmentInstruction(key.image, val, false)); }
         )
     )*