Changeset 35287 in osm for applications/editors

Timestamp:

2020-01-13T21:45:22+01:00 (5 years ago)

Author:

simon04

Message:

JOSM/comfort0: enforce newline after comment

File:

• applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/level0l/Level0LParser.jj (modified) (4 diffs)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/level0l/Level0LParser.jj

@@ -29 +29 @@
 
 <COMMENT>
-SKIP: { < ~[] > }
+SKIP: { < ~["\n", "\r"] > }
 
 <COMMENT>
@@ -70 +70 @@
     lon=<FLOAT>
     { r.setCoor(new LatLon(Double.parseDouble(lat.image), Double.parseDouble(lon.image))); }
-    ( <COMMENT_START> | <H_EOL> )
+    ( <COMMENT_START> <C_EOL> | <H_EOL> )
     ( <D_SPACE> <D_SPACE> tag(r) )*
     { return r; }
@@ -85 +85 @@
     id=<H_ID>
     { r.setId(Long.parseLong(id.image)); }
-    ( <COMMENT_START> | <H_EOL> )
+    ( <COMMENT_START> <C_EOL> | <H_EOL> )
     way_data(r)
     { return r; }
@@ -109 +109 @@
     { r.getNodeIds().add(Long.parseLong(id.image)); }
     ( <D_SPACE> )*
-    ( <D_COMMENT_START> | <D_EOL> )
+    ( <D_COMMENT_START> <C_EOL> | <D_EOL> )
 }