Changeset 35284 in osm for applications/editors/josm/plugins/comfort0/src/net

Timestamp:

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

Author:

simon04

Message:

JOSM/comfort0: parse tags

File:

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

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

@@ -17 +17 @@
 <DEFAULT> //HEADER
 TOKEN: {
-    <H_EOL: ("\n" | "\r" | "\r\n") >
+    <H_EOL: ("\n" | "\r" | "\r\n") > : DATA
     | <H_ID: (["0"-"9"])+ >
     | <NODE: "node" >
@@ -39 +39 @@
 TOKEN: {
     <D_EOL: ("\n" | "\r" | "\r\n") >
+    | <D_SPACE: " " >
     | <D_ID: (["0"-"9"])+ >
     | <WY: "wy" >
     | <ND: "nd" >
     | <REL: "rel" >
-    | <EQ: "=" >
+    | <EQ: "=" > : VALUE
     | <IDENT: ["a"-"z", "A"-"Z", "_"] (["a"-"z", "A"-"Z", "_", "-", "0"-"9"])* >
+}
+
+<VALUE>
+TOKEN: {
+    <V_EOL: ("\n" | "\r" | "\r\n") > : DATA
+    | <TEXT: (~["\n", "\r"])+ >
 }
 
@@ -63 +70 @@
     { r.setCoor(new LatLon(Double.parseDouble(lat.image), Double.parseDouble(lon.image))); }
     (<COMMENT_START> | <H_EOL>)
+    tags(r)
     { return r; }
 }
+
+void tags(PrimitiveData r):
+{}
+{
+    ( tag(r) )*
+}
+
+void tag(PrimitiveData r):
+{
+    Token k, v;
+}
+{
+    <D_SPACE> <D_SPACE>
+    k=<IDENT>
+    ( <D_SPACE> ) *
+    <EQ>
+    v=<TEXT>
+    <V_EOL>
+    { r.put(k.image.trim(), v.image.trim()); }
+}