Changeset 35291 in osm for applications/editors/josm/plugins/comfort0/src

Timestamp:

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

Author:

simon04

Message:

JOSM/comfort0: Level0LParser.jj <WHITESPACE>

File:

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

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

@@ -1 +1 @@
 options {
   STATIC = false;
-  OUTPUT_DIRECTORY = "parsergen";
 }
 
@@ -15 +14 @@
 
 <DEFAULT> //HEADER
-SKIP: { " " }
-
-<DEFAULT> //HEADER
 TOKEN: {
-    <H_EOL: ("\n" | "\r" | "\r\n") > : DATA
-    | <H_ID: (["0"-"9"])+ >
+    <EOL: ("\n" | "\r" | "\r\n") >
+    | <ID: (["0"-"9"])+ >
     | <NODE: "node" >
     | <WAY: "way" >
     | <RELATION: "relation" >
+    | <WY: "wy" >
+    | <ND: "nd" >
+    | <REL: "rel" >
+    | <EQ: "=" > : VALUE
+    | <IDENT: ["a"-"z", "A"-"Z", "_"] (["a"-"z", "A"-"Z", "_", ":", "-", "0"-"9"])* >
     | <FLOAT: ("+" | "-")? (["0"-"9"])+ ("." (["0"-"9"])+)? >
     | <COLON: ":" >
     | <COMMA: "," >
+    | <WHITESPACE: ([" ", "\t"])+ >
     | <COMMENT_START: "#"> : COMMENT
 }
@@ -35 +37 @@
 <COMMENT>
 TOKEN: {
-    <C_EOL: ("\n" | "\r" | "\r\n") > : DATA
-}
-
-<DATA>
-TOKEN: {
-    <D_EOL: ("\n" | "\r" | "\r\n") >
-    | <D_SPACE: " " >
-    | <D_ID: (["0"-"9"])+ >
-    | <WY: "wy" >
-    | <ND: "nd" >
-    | <REL: "rel" >
-    | <EQ: "=" > : VALUE
-    | <IDENT: ["a"-"z", "A"-"Z", "_"] (["a"-"z", "A"-"Z", "_", "-", "0"-"9"])* >
-    | <D_COMMENT_START: "#"> : COMMENT
+    <C_EOL: ("\n" | "\r" | "\r\n") > : DEFAULT
 }
 
 <VALUE>
 TOKEN: {
-    <V_EOL: ("\n" | "\r" | "\r\n") > : DATA
+    <V_EOL: ("\n" | "\r" | "\r\n") > : DEFAULT
     | <TEXT: (~["\n", "\r"])+ >
 }
@@ -64 +53 @@
 {
     (
-        ( p = node() | p = way() | p = relation() )
+        p = node()
         { primitives.add(p); }
+    |
+        p = way()
+        { primitives.add(p); }
+    |
+        p = relation()
+        { primitives.add(p); }
+    |
+        <COMMENT_START> <C_EOL> | <EOL>
     )*
     <EOF>
@@ -79 +76 @@
     <NODE>
     { r = new NodeData(); }
-    id=<H_ID>
+    ( <WHITESPACE> )+
+    id=<ID>
     { r.setId(Long.parseLong(id.image)); }
+    ( <WHITESPACE> )*
     <COLON>
+    ( <WHITESPACE> )*
     lat=<FLOAT>
+    ( <WHITESPACE> )*
     <COMMA>
+    ( <WHITESPACE> )*
     lon=<FLOAT>
     { r.setCoor(new LatLon(Double.parseDouble(lat.image), Double.parseDouble(lon.image))); }
-    ( <COMMENT_START> <C_EOL> | <H_EOL> )
-    ( <D_SPACE> <D_SPACE> tag(r) )*
+    ( <WHITESPACE> )*
+    ( <COMMENT_START> <C_EOL> | <EOL> )
+    ( tag(r) )*
     { return r; }
 }
@@ -98 +101 @@
 {
     <WAY>
+    ( <WHITESPACE> )+
     { r = new WayData(); }
-    id=<H_ID>
+    id=<ID>
     { r.setId(Long.parseLong(id.image)); }
-    ( <COMMENT_START> <C_EOL> | <H_EOL> )
+    ( <WHITESPACE> )*
+    ( <COMMENT_START> <C_EOL> | <EOL> )
     way_data(r)
     { return r; }
@@ -113 +118 @@
 {
     <RELATION>
+    ( <WHITESPACE> )+
     { r = new RelationData(); }
-    id=<H_ID>
+    id=<ID>
     { r.setId(Long.parseLong(id.image)); }
-    ( <COMMENT_START> <C_EOL> | <H_EOL> )
+    ( <WHITESPACE> )*
+    ( <COMMENT_START> <C_EOL> | <EOL> )
     relation_data(r)
     { return r; }
@@ -124 +131 @@
 {}
 {
-    (
-        <D_SPACE> <D_SPACE>
-        ( way_node(r) | tag(r) )
-    )*
+    ( LOOKAHEAD(3) way_node(r) | tag(r) )*
 }
 
@@ -135 +139 @@
 }
 {
+    ( <WHITESPACE> )+
     <ND>
-    ( <D_SPACE> )+
-    id=<D_ID>
+    ( <WHITESPACE> )+
+    id=<ID>
     { r.getNodeIds().add(Long.parseLong(id.image)); }
-    ( <D_SPACE> )*
-    ( <D_COMMENT_START> <C_EOL> | <D_EOL> )
+    ( <WHITESPACE> )*
+    ( <COMMENT_START> <C_EOL> | <EOL> )
 }
 
@@ -146 +151 @@
 {}
 {
-    (
-        <D_SPACE> <D_SPACE>
-        ( relation_member(r) | tag(r) )
-    )*
+    ( LOOKAHEAD(3) relation_member(r) | tag(r) )*
 }
 
@@ -159 +161 @@
 }
 {
+    ( <WHITESPACE> )+
     (
         <ND> { type = OsmPrimitiveType.NODE; }
@@ -166 +169 @@
         <REL> { type = OsmPrimitiveType.RELATION; }
     )
-    <D_SPACE>
-    id=<D_ID>
+    ( <WHITESPACE> )+
+    id=<ID>
     (
-        <D_SPACE>
-        (
-            role=<IDENT> ( <D_SPACE> )*
-        |
-            ( <D_SPACE> )*
-        )
+        LOOKAHEAD(2)
+        ( <WHITESPACE> )+
+        role=<IDENT>
     )?
     { r.getMembers().add(new RelationMemberData(role != null ? role.image : "", type, Long.parseLong(id.image))); }
-    ( <D_COMMENT_START> <C_EOL> | <D_EOL> )
+    ( <WHITESPACE> )*
+    ( <COMMENT_START> <C_EOL> | <EOL> )
 }
 
@@ -185 +186 @@
 }
 {
+    ( <WHITESPACE> )+
     k=<IDENT>
-    ( <D_SPACE> ) *
+    ( <WHITESPACE> )*
     <EQ>
+    ( <WHITESPACE> )*
     v=<TEXT>
     <V_EOL>