From caf7f3efb9ff6c747d1ee1bcf456fe1e4d568bfe Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 27 Mar 2019 12:23:27 +0200
Subject: [PATCH] Moved parser into main source folders

---
 {parser => app/imports/parser}/grammar.js |    0
 {parser => app/imports/parser}/grammar.ne |    0
 app/imports/parser/parser.js              |    8 +
 app/imports/parser/readme.md              |   14 +
 app/package-lock.json                     |  115 ++
 app/package.json                          |    2 +
 parser/.gitignore                         |    1 -
 parser/grammar.html                       | 1251 ---------------------
 parser/package-lock.json                  |   75 --
 parser/package.json                       |   15 -
 10 files changed, 139 insertions(+), 1342 deletions(-)
 rename {parser => app/imports/parser}/grammar.js (100%)
 rename {parser => app/imports/parser}/grammar.ne (100%)
 create mode 100644 app/imports/parser/parser.js
 create mode 100644 app/imports/parser/readme.md
 delete mode 100644 parser/.gitignore
 delete mode 100644 parser/grammar.html
 delete mode 100644 parser/package-lock.json
 delete mode 100644 parser/package.json

diff --git a/parser/grammar.js b/app/imports/parser/grammar.js
similarity index 100%
rename from parser/grammar.js
rename to app/imports/parser/grammar.js
diff --git a/parser/grammar.ne b/app/imports/parser/grammar.ne
similarity index 100%
rename from parser/grammar.ne
rename to app/imports/parser/grammar.ne
diff --git a/app/imports/parser/parser.js b/app/imports/parser/parser.js
new file mode 100644
index 00000000..12328243
--- /dev/null
+++ b/app/imports/parser/parser.js
@@ -0,0 +1,8 @@
+import grammar from '/imports/parser/grammar.js';
+import nearley from 'nearley';
+
+const nearleyGrammar = nearley.Grammar.fromCompiled(grammar);
+
+export default function parser(){
+  return new nearley.Parser(nearleyGrammar);
+}
diff --git a/app/imports/parser/readme.md b/app/imports/parser/readme.md
new file mode 100644
index 00000000..d6b5b0e3
--- /dev/null
+++ b/app/imports/parser/readme.md
@@ -0,0 +1,14 @@
+The grammer.js file is built separately from the rest of the build process
+to rebuild the grammar after changing grammar.ne:
+
+make sure Nearley in installed
+
+`npm install -g nearley`
+
+compile
+
+`nearleyc grammar.ne -o grammar.js`
+
+To make this happen as part of the build process, a Meteor build plugin needs to
+created that can compile `.ne` files to `.js` and include them where ever
+they need to be imported.
diff --git a/app/package-lock.json b/app/package-lock.json
index 2b5a3953..367ddeae 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -199,6 +199,11 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "commander": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+    },
     "complex.js": {
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz",
@@ -294,6 +299,11 @@
       "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
       "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
     },
+    "discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo="
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -1446,6 +1456,37 @@
           "requires": {
             "inherits": "~2.0.1",
             "readable-stream": "^2.0.2"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+              "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.3",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+                }
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "stream-http": {
@@ -1458,6 +1499,37 @@
             "readable-stream": "^2.3.3",
             "to-arraybuffer": "^1.0.0",
             "xtend": "^4.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+              "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.3",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+                }
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
           }
         },
         "string_decoder": {
@@ -1585,6 +1657,11 @@
         "lodash.without": "^4.4.0"
       }
     },
+    "moo": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.0.tgz",
+      "integrity": "sha512-AMv6iqhTEd5vT/cQlH6cammKS5ekyHhyqTRKi5zKMWl1RTyFnQ3ohPSBNSm8ySe2wlxSKwDonr9D5ZT44mdO3g=="
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1595,6 +1672,25 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
       "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
     },
+    "nearley": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.16.0.tgz",
+      "integrity": "sha512-Tr9XD3Vt/EujXbZBv6UAHYoLUSMQAxSsTnm9K3koXzjzNWY195NqALeyrzLZBKzAkL3gl92BcSogqrHjD8QuUg==",
+      "requires": {
+        "commander": "^2.19.0",
+        "moo": "^0.4.3",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6",
+        "semver": "^5.4.1"
+      },
+      "dependencies": {
+        "moo": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
+          "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw=="
+        }
+      }
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -1805,6 +1901,20 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
+    "railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
+    },
+    "randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "requires": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      }
+    },
     "rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -1879,6 +1989,11 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
     "rimraf": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
diff --git a/app/package.json b/app/package.json
index a054b6b8..ba92bb35 100644
--- a/app/package.json
+++ b/app/package.json
@@ -22,6 +22,8 @@
     "lodash": "^4.17.11",
     "mathjs": "^5.5.0",
     "meteor-node-stubs": "^0.3.3",
+    "moo": "^0.5.0",
+    "nearley": "^2.16.0",
     "qrcode": "^1.3.3",
     "simpl-schema": "^1.5.5",
     "source-map-support": "^0.5.10",
diff --git a/parser/.gitignore b/parser/.gitignore
deleted file mode 100644
index 3c3629e6..00000000
--- a/parser/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/parser/grammar.html b/parser/grammar.html
deleted file mode 100644
index 3b0a39e8..00000000
--- a/parser/grammar.html
+++ /dev/null
@@ -1,1251 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<style type="text/css">
-svg.railroad-diagram {
-    background-color: hsl(30,20%,95%);
-}
-svg.railroad-diagram path {
-    stroke-width: 3;
-    stroke: black;
-    fill: rgba(0,0,0,0);
-}
-svg.railroad-diagram text {
-    font: bold 14px monospace;
-    text-anchor: middle;
-}
-svg.railroad-diagram text.label {
-    text-anchor: start;
-}
-svg.railroad-diagram text.comment {
-    font: italic 12px monospace;
-}
-svg.railroad-diagram rect {
-    stroke-width: 3;
-    stroke: black;
-    fill: hsl(120,100%,90%);
-}
-
-</style>
-</head>
-<body>
-<h1><code>ifStatement</code></h1>
-<div>
-<svg class="railroad-diagram" width="1105" height="92" viewBox="0 0 1105 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M1064 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M1044 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M122 31h0"></path>
-<rect x="70" y="20" width="52" height="22" rx="10" ry="10"></rect>
-<text x="96" y="35">"if"</text>
-</g>
-<path d="M122 31h10"></path>
-<path d="M132 31h10"></path>
-<g>
-<path d="M142 31h0"></path>
-<path d="M170 31h0"></path>
-<rect x="142" y="20" width="28" height="22"></rect>
-<text x="156" y="35">&#95;</text>
-</g>
-<path d="M170 31h10"></path>
-<path d="M180 31h10"></path>
-<g>
-<path d="M190 31h0"></path>
-<path d="M234 31h0"></path>
-<rect x="190" y="20" width="44" height="22" rx="10" ry="10"></rect>
-<text x="212" y="35">"("</text>
-</g>
-<path d="M234 31h10"></path>
-<path d="M244 31h10"></path>
-<g>
-<path d="M254 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="254" y="20" width="28" height="22"></rect>
-<text x="268" y="35">&#95;</text>
-</g>
-<path d="M282 31h10"></path>
-<path d="M292 31h10"></path>
-<g>
-<path d="M302 31h0"></path>
-<path d="M434 31h0"></path>
-<rect x="302" y="20" width="132" height="22"></rect>
-<text x="368" y="35">callExpression</text>
-</g>
-<path d="M434 31h10"></path>
-<path d="M444 31h10"></path>
-<g>
-<path d="M454 31h0"></path>
-<path d="M482 31h0"></path>
-<rect x="454" y="20" width="28" height="22"></rect>
-<text x="468" y="35">&#95;</text>
-</g>
-<path d="M482 31h10"></path>
-<path d="M492 31h10"></path>
-<g>
-<path d="M502 31h0"></path>
-<path d="M546 31h0"></path>
-<rect x="502" y="20" width="44" height="22" rx="10" ry="10"></rect>
-<text x="524" y="35">")"</text>
-</g>
-<path d="M546 31h10"></path>
-<path d="M556 31h10"></path>
-<g>
-<path d="M566 31h0"></path>
-<path d="M594 31h0"></path>
-<rect x="566" y="20" width="28" height="22"></rect>
-<text x="580" y="35">&#95;</text>
-</g>
-<path d="M594 31h10"></path>
-<path d="M604 31h10"></path>
-<g>
-<path d="M614 31h0"></path>
-<path d="M722 31h0"></path>
-<rect x="614" y="20" width="108" height="22"></rect>
-<text x="668" y="35">ifStatement</text>
-</g>
-<path d="M722 31h10"></path>
-<path d="M732 31h10"></path>
-<g>
-<path d="M742 31h0"></path>
-<path d="M770 31h0"></path>
-<rect x="742" y="20" width="28" height="22"></rect>
-<text x="756" y="35">&#95;</text>
-</g>
-<path d="M770 31h10"></path>
-<path d="M780 31h10"></path>
-<g>
-<path d="M790 31h0"></path>
-<path d="M858 31h0"></path>
-<rect x="790" y="20" width="68" height="22" rx="10" ry="10"></rect>
-<text x="824" y="35">"else"</text>
-</g>
-<path d="M858 31h10"></path>
-<path d="M868 31h10"></path>
-<g>
-<path d="M878 31h0"></path>
-<path d="M906 31h0"></path>
-<rect x="878" y="20" width="28" height="22"></rect>
-<text x="892" y="35">&#95;</text>
-</g>
-<path d="M906 31h10"></path>
-<path d="M916 31h10"></path>
-<g>
-<path d="M926 31h0"></path>
-<path d="M1034 31h0"></path>
-<rect x="926" y="20" width="108" height="22"></rect>
-<text x="980" y="35">ifStatement</text>
-</g>
-<path d="M1034 31h10"></path>
-</g>
-<path d="M1044 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h416"></path>
-<path d="M628 61h416"></path>
-<path d="M476 61h10"></path>
-<g>
-<path d="M486 61h0"></path>
-<path d="M618 61h0"></path>
-<rect x="486" y="50" width="132" height="22"></rect>
-<text x="552" y="65">callExpression</text>
-</g>
-<path d="M618 61h10"></path>
-</g>
-<path d="M1044 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 1064 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>callExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="353" height="92" viewBox="0 0 353 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M312 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M292 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M122 31h0"></path>
-<rect x="70" y="20" width="52" height="22"></rect>
-<text x="96" y="35">name</text>
-</g>
-<path d="M122 31h10"></path>
-<path d="M132 31h10"></path>
-<g>
-<path d="M142 31h0"></path>
-<path d="M170 31h0"></path>
-<rect x="142" y="20" width="28" height="22"></rect>
-<text x="156" y="35">&#95;</text>
-</g>
-<path d="M170 31h10"></path>
-<path d="M180 31h10"></path>
-<g>
-<path d="M190 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="190" y="20" width="92" height="22"></rect>
-<text x="236" y="35">arguments</text>
-</g>
-<path d="M282 31h10"></path>
-</g>
-<path d="M292 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h56"></path>
-<path d="M236 61h56"></path>
-<path d="M116 61h10"></path>
-<g>
-<path d="M126 61h0"></path>
-<path d="M226 61h0"></path>
-<rect x="126" y="50" width="100" height="22"></rect>
-<text x="176" y="65">expression</text>
-</g>
-<path d="M226 61h10"></path>
-</g>
-<path d="M292 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 312 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>arguments</code></h1>
-<div>
-<svg class="railroad-diagram" width="925" height="81" viewBox="0 0 925 81">
-<g transform="translate(.5 .5)">
-<path d="M 20 31 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 41h0"></path>
-<path d="M884 41h0"></path>
-<path d="M40 41h20"></path>
-<g>
-<path d="M60 41h0"></path>
-<path d="M864 41h0"></path>
-<path d="M60 41h10"></path>
-<g>
-<path d="M70 41h0"></path>
-<path d="M114 41h0"></path>
-<rect x="70" y="30" width="44" height="22" rx="10" ry="10"></rect>
-<text x="92" y="45">"("</text>
-</g>
-<path d="M114 41h10"></path>
-<path d="M124 41h10"></path>
-<g>
-<path d="M134 41h0"></path>
-<path d="M162 41h0"></path>
-<rect x="134" y="30" width="28" height="22"></rect>
-<text x="148" y="45">&#95;</text>
-</g>
-<path d="M162 41h10"></path>
-<g>
-<path d="M172 41h0"></path>
-<path d="M372 41h0"></path>
-<path d="M172 41a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path>
-<g>
-<path d="M192 21h160"></path>
-</g>
-<path d="M352 21a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
-<path d="M172 41h20"></path>
-<g>
-<path d="M192 41h0"></path>
-<path d="M352 41h0"></path>
-<path d="M192 41h20"></path>
-<g>
-<path d="M212 41h0"></path>
-<path d="M332 41h0"></path>
-<path d="M212 41h10"></path>
-<g>
-<path d="M222 41h0"></path>
-<path d="M322 41h0"></path>
-<rect x="222" y="30" width="100" height="22"></rect>
-<text x="272" y="45">expression</text>
-</g>
-<path d="M322 41h10"></path>
-</g>
-<path d="M332 41h20"></path>
-</g>
-<path d="M352 41h20"></path>
-</g>
-<g>
-<path d="M372 41h0"></path>
-<path d="M752 41h0"></path>
-<path d="M372 41a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path>
-<g>
-<path d="M392 21h340"></path>
-</g>
-<path d="M732 21a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path>
-<path d="M372 41h20"></path>
-<g>
-<path d="M392 41h0"></path>
-<path d="M732 41h0"></path>
-<path d="M392 41h10"></path>
-<g>
-<path d="M402 41h0"></path>
-<path d="M722 41h0"></path>
-<path d="M402 41h20"></path>
-<g>
-<path d="M422 41h0"></path>
-<path d="M702 41h0"></path>
-<path d="M422 41h10"></path>
-<g>
-<path d="M432 41h0"></path>
-<path d="M460 41h0"></path>
-<rect x="432" y="30" width="28" height="22"></rect>
-<text x="446" y="45">&#95;</text>
-</g>
-<path d="M460 41h10"></path>
-<path d="M470 41h10"></path>
-<g>
-<path d="M480 41h0"></path>
-<path d="M524 41h0"></path>
-<rect x="480" y="30" width="44" height="22" rx="10" ry="10"></rect>
-<text x="502" y="45">","</text>
-</g>
-<path d="M524 41h10"></path>
-<path d="M534 41h10"></path>
-<g>
-<path d="M544 41h0"></path>
-<path d="M572 41h0"></path>
-<rect x="544" y="30" width="28" height="22"></rect>
-<text x="558" y="45">&#95;</text>
-</g>
-<path d="M572 41h10"></path>
-<path d="M582 41h10"></path>
-<g>
-<path d="M592 41h0"></path>
-<path d="M692 41h0"></path>
-<rect x="592" y="30" width="100" height="22"></rect>
-<text x="642" y="45">expression</text>
-</g>
-<path d="M692 41h10"></path>
-</g>
-<path d="M702 41h20"></path>
-</g>
-<path d="M722 41h10"></path>
-<path d="M402 41a10 10 0 0 0 -10 10v0a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M402 61h320"></path>
-</g>
-<path d="M722 61a10 10 0 0 0 10 -10v0a10 10 0 0 0 -10 -10"></path>
-</g>
-<path d="M732 41h20"></path>
-</g>
-<path d="M752 41h10"></path>
-<g>
-<path d="M762 41h0"></path>
-<path d="M790 41h0"></path>
-<rect x="762" y="30" width="28" height="22"></rect>
-<text x="776" y="45">&#95;</text>
-</g>
-<path d="M790 41h10"></path>
-<path d="M800 41h10"></path>
-<g>
-<path d="M810 41h0"></path>
-<path d="M854 41h0"></path>
-<rect x="810" y="30" width="44" height="22" rx="10" ry="10"></rect>
-<text x="832" y="45">")"</text>
-</g>
-<path d="M854 41h10"></path>
-</g>
-<path d="M864 41h20"></path>
-</g>
-<path d="M 884 41 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>expression</code></h1>
-<div>
-<svg class="railroad-diagram" width="305" height="62" viewBox="0 0 305 62">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M264 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M244 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M234 31h0"></path>
-<rect x="70" y="20" width="164" height="22"></rect>
-<text x="152" y="35">equalityExpression</text>
-</g>
-<path d="M234 31h10"></path>
-</g>
-<path d="M244 31h20"></path>
-</g>
-<path d="M 264 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>equalityExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="769" height="92" viewBox="0 0 769 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M728 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M708 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M234 31h0"></path>
-<rect x="70" y="20" width="164" height="22"></rect>
-<text x="152" y="35">equalityExpression</text>
-</g>
-<path d="M234 31h10"></path>
-<path d="M244 31h10"></path>
-<g>
-<path d="M254 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="254" y="20" width="28" height="22"></rect>
-<text x="268" y="35">&#95;</text>
-</g>
-<path d="M282 31h10"></path>
-<path d="M292 31h10"></path>
-<g>
-<path d="M302 31h0"></path>
-<path d="M450 31h0"></path>
-<rect x="302" y="20" width="148" height="22" rx="10" ry="10"></rect>
-<text x="376" y="35">equalityOperator</text>
-</g>
-<path d="M450 31h10"></path>
-<path d="M460 31h10"></path>
-<g>
-<path d="M470 31h0"></path>
-<path d="M498 31h0"></path>
-<rect x="470" y="20" width="28" height="22"></rect>
-<text x="484" y="35">&#95;</text>
-</g>
-<path d="M498 31h10"></path>
-<path d="M508 31h10"></path>
-<g>
-<path d="M518 31h0"></path>
-<path d="M698 31h0"></path>
-<rect x="518" y="20" width="180" height="22"></rect>
-<text x="608" y="35">relationalExpression</text>
-</g>
-<path d="M698 31h10"></path>
-</g>
-<path d="M708 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h224"></path>
-<path d="M484 61h224"></path>
-<path d="M284 61h10"></path>
-<g>
-<path d="M294 61h0"></path>
-<path d="M474 61h0"></path>
-<rect x="294" y="50" width="180" height="22"></rect>
-<text x="384" y="65">relationalExpression</text>
-</g>
-<path d="M474 61h10"></path>
-</g>
-<path d="M708 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 728 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>relationalExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="737" height="92" viewBox="0 0 737 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M696 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M676 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M250 31h0"></path>
-<rect x="70" y="20" width="180" height="22"></rect>
-<text x="160" y="35">relationalExpression</text>
-</g>
-<path d="M250 31h10"></path>
-<path d="M260 31h10"></path>
-<g>
-<path d="M270 31h0"></path>
-<path d="M298 31h0"></path>
-<rect x="270" y="20" width="28" height="22"></rect>
-<text x="284" y="35">&#95;</text>
-</g>
-<path d="M298 31h10"></path>
-<path d="M308 31h10"></path>
-<g>
-<path d="M318 31h0"></path>
-<path d="M482 31h0"></path>
-<rect x="318" y="20" width="164" height="22" rx="10" ry="10"></rect>
-<text x="400" y="35">relationalOperator</text>
-</g>
-<path d="M482 31h10"></path>
-<path d="M492 31h10"></path>
-<g>
-<path d="M502 31h0"></path>
-<path d="M530 31h0"></path>
-<rect x="502" y="20" width="28" height="22"></rect>
-<text x="516" y="35">&#95;</text>
-</g>
-<path d="M530 31h10"></path>
-<path d="M540 31h10"></path>
-<g>
-<path d="M550 31h0"></path>
-<path d="M666 31h0"></path>
-<rect x="550" y="20" width="116" height="22"></rect>
-<text x="608" y="35">orExpression</text>
-</g>
-<path d="M666 31h10"></path>
-</g>
-<path d="M676 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h240"></path>
-<path d="M436 61h240"></path>
-<path d="M300 61h10"></path>
-<g>
-<path d="M310 61h0"></path>
-<path d="M426 61h0"></path>
-<rect x="310" y="50" width="116" height="22"></rect>
-<text x="368" y="65">orExpression</text>
-</g>
-<path d="M426 61h10"></path>
-</g>
-<path d="M676 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 696 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>orExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="617" height="92" viewBox="0 0 617 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M576 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M556 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M186 31h0"></path>
-<rect x="70" y="20" width="116" height="22"></rect>
-<text x="128" y="35">orExpression</text>
-</g>
-<path d="M186 31h10"></path>
-<path d="M196 31h10"></path>
-<g>
-<path d="M206 31h0"></path>
-<path d="M234 31h0"></path>
-<rect x="206" y="20" width="28" height="22"></rect>
-<text x="220" y="35">&#95;</text>
-</g>
-<path d="M234 31h10"></path>
-<path d="M244 31h10"></path>
-<g>
-<path d="M254 31h0"></path>
-<path d="M354 31h0"></path>
-<rect x="254" y="20" width="100" height="22" rx="10" ry="10"></rect>
-<text x="304" y="35">orOperator</text>
-</g>
-<path d="M354 31h10"></path>
-<path d="M364 31h10"></path>
-<g>
-<path d="M374 31h0"></path>
-<path d="M402 31h0"></path>
-<rect x="374" y="20" width="28" height="22"></rect>
-<text x="388" y="35">&#95;</text>
-</g>
-<path d="M402 31h10"></path>
-<path d="M412 31h10"></path>
-<g>
-<path d="M422 31h0"></path>
-<path d="M546 31h0"></path>
-<rect x="422" y="20" width="124" height="22"></rect>
-<text x="484" y="35">andExpression</text>
-</g>
-<path d="M546 31h10"></path>
-</g>
-<path d="M556 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h176"></path>
-<path d="M380 61h176"></path>
-<path d="M236 61h10"></path>
-<g>
-<path d="M246 61h0"></path>
-<path d="M370 61h0"></path>
-<rect x="246" y="50" width="124" height="22"></rect>
-<text x="308" y="65">andExpression</text>
-</g>
-<path d="M370 61h10"></path>
-</g>
-<path d="M556 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 576 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>andExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="673" height="92" viewBox="0 0 673 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M632 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M612 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M194 31h0"></path>
-<rect x="70" y="20" width="124" height="22"></rect>
-<text x="132" y="35">andExpression</text>
-</g>
-<path d="M194 31h10"></path>
-<path d="M204 31h10"></path>
-<g>
-<path d="M214 31h0"></path>
-<path d="M242 31h0"></path>
-<rect x="214" y="20" width="28" height="22"></rect>
-<text x="228" y="35">&#95;</text>
-</g>
-<path d="M242 31h10"></path>
-<path d="M252 31h10"></path>
-<g>
-<path d="M262 31h0"></path>
-<path d="M370 31h0"></path>
-<rect x="262" y="20" width="108" height="22" rx="10" ry="10"></rect>
-<text x="316" y="35">andOperator</text>
-</g>
-<path d="M370 31h10"></path>
-<path d="M380 31h10"></path>
-<g>
-<path d="M390 31h0"></path>
-<path d="M418 31h0"></path>
-<rect x="390" y="20" width="28" height="22"></rect>
-<text x="404" y="35">&#95;</text>
-</g>
-<path d="M418 31h10"></path>
-<path d="M428 31h10"></path>
-<g>
-<path d="M438 31h0"></path>
-<path d="M602 31h0"></path>
-<rect x="438" y="20" width="164" height="22"></rect>
-<text x="520" y="35">additiveExpression</text>
-</g>
-<path d="M602 31h10"></path>
-</g>
-<path d="M612 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h184"></path>
-<path d="M428 61h184"></path>
-<path d="M244 61h10"></path>
-<g>
-<path d="M254 61h0"></path>
-<path d="M418 61h0"></path>
-<rect x="254" y="50" width="164" height="22"></rect>
-<text x="336" y="65">additiveExpression</text>
-</g>
-<path d="M418 61h10"></path>
-</g>
-<path d="M612 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 632 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>additiveExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="801" height="92" viewBox="0 0 801 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M760 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M740 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M234 31h0"></path>
-<rect x="70" y="20" width="164" height="22"></rect>
-<text x="152" y="35">additiveExpression</text>
-</g>
-<path d="M234 31h10"></path>
-<path d="M244 31h10"></path>
-<g>
-<path d="M254 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="254" y="20" width="28" height="22"></rect>
-<text x="268" y="35">&#95;</text>
-</g>
-<path d="M282 31h10"></path>
-<path d="M292 31h10"></path>
-<g>
-<path d="M302 31h0"></path>
-<path d="M450 31h0"></path>
-<rect x="302" y="20" width="148" height="22" rx="10" ry="10"></rect>
-<text x="376" y="35">additiveOperator</text>
-</g>
-<path d="M450 31h10"></path>
-<path d="M460 31h10"></path>
-<g>
-<path d="M470 31h0"></path>
-<path d="M498 31h0"></path>
-<rect x="470" y="20" width="28" height="22"></rect>
-<text x="484" y="35">&#95;</text>
-</g>
-<path d="M498 31h10"></path>
-<path d="M508 31h10"></path>
-<g>
-<path d="M518 31h0"></path>
-<path d="M730 31h0"></path>
-<rect x="518" y="20" width="212" height="22"></rect>
-<text x="624" y="35">multiplicativeExpression</text>
-</g>
-<path d="M730 31h10"></path>
-</g>
-<path d="M740 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h224"></path>
-<path d="M516 61h224"></path>
-<path d="M284 61h10"></path>
-<g>
-<path d="M294 61h0"></path>
-<path d="M506 61h0"></path>
-<rect x="294" y="50" width="212" height="22"></rect>
-<text x="400" y="65">multiplicativeExpression</text>
-</g>
-<path d="M506 61h10"></path>
-</g>
-<path d="M740 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 760 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>multiplicativeExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="817" height="92" viewBox="0 0 817 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M776 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M756 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="70" y="20" width="212" height="22"></rect>
-<text x="176" y="35">multiplicativeExpression</text>
-</g>
-<path d="M282 31h10"></path>
-<path d="M292 31h10"></path>
-<g>
-<path d="M302 31h0"></path>
-<path d="M330 31h0"></path>
-<rect x="302" y="20" width="28" height="22"></rect>
-<text x="316" y="35">&#95;</text>
-</g>
-<path d="M330 31h10"></path>
-<path d="M340 31h10"></path>
-<g>
-<path d="M350 31h0"></path>
-<path d="M546 31h0"></path>
-<rect x="350" y="20" width="196" height="22" rx="10" ry="10"></rect>
-<text x="448" y="35">multiplicativeOperator</text>
-</g>
-<path d="M546 31h10"></path>
-<path d="M556 31h10"></path>
-<g>
-<path d="M566 31h0"></path>
-<path d="M594 31h0"></path>
-<rect x="566" y="20" width="28" height="22"></rect>
-<text x="580" y="35">&#95;</text>
-</g>
-<path d="M594 31h10"></path>
-<path d="M604 31h10"></path>
-<g>
-<path d="M614 31h0"></path>
-<path d="M746 31h0"></path>
-<rect x="614" y="20" width="132" height="22"></rect>
-<text x="680" y="35">rollExpression</text>
-</g>
-<path d="M746 31h10"></path>
-</g>
-<path d="M756 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h272"></path>
-<path d="M484 61h272"></path>
-<path d="M332 61h10"></path>
-<g>
-<path d="M342 61h0"></path>
-<path d="M474 61h0"></path>
-<rect x="342" y="50" width="132" height="22"></rect>
-<text x="408" y="65">rollExpression</text>
-</g>
-<path d="M474 61h10"></path>
-</g>
-<path d="M756 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 776 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>rollExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="617" height="92" viewBox="0 0 617 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M576 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M556 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M202 31h0"></path>
-<rect x="70" y="20" width="132" height="22"></rect>
-<text x="136" y="35">rollExpression</text>
-</g>
-<path d="M202 31h10"></path>
-<path d="M212 31h10"></path>
-<g>
-<path d="M222 31h0"></path>
-<path d="M250 31h0"></path>
-<rect x="222" y="20" width="28" height="22"></rect>
-<text x="236" y="35">&#95;</text>
-</g>
-<path d="M250 31h10"></path>
-<path d="M260 31h10"></path>
-<g>
-<path d="M270 31h0"></path>
-<path d="M314 31h0"></path>
-<rect x="270" y="20" width="44" height="22" rx="10" ry="10"></rect>
-<text x="292" y="35">"d"</text>
-</g>
-<path d="M314 31h10"></path>
-<path d="M324 31h10"></path>
-<g>
-<path d="M334 31h0"></path>
-<path d="M362 31h0"></path>
-<rect x="334" y="20" width="28" height="22"></rect>
-<text x="348" y="35">&#95;</text>
-</g>
-<path d="M362 31h10"></path>
-<path d="M372 31h10"></path>
-<g>
-<path d="M382 31h0"></path>
-<path d="M546 31h0"></path>
-<rect x="382" y="20" width="164" height="22"></rect>
-<text x="464" y="35">exponentExpression</text>
-</g>
-<path d="M546 31h10"></path>
-</g>
-<path d="M556 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h156"></path>
-<path d="M400 61h156"></path>
-<path d="M216 61h10"></path>
-<g>
-<path d="M226 61h0"></path>
-<path d="M390 61h0"></path>
-<rect x="226" y="50" width="164" height="22"></rect>
-<text x="308" y="65">exponentExpression</text>
-</g>
-<path d="M390 61h10"></path>
-</g>
-<path d="M556 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 576 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>exponentExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="793" height="92" viewBox="0 0 793 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M752 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M732 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M274 31h0"></path>
-<rect x="70" y="20" width="204" height="22"></rect>
-<text x="172" y="35">parenthesizedExpression</text>
-</g>
-<path d="M274 31h10"></path>
-<path d="M284 31h10"></path>
-<g>
-<path d="M294 31h0"></path>
-<path d="M322 31h0"></path>
-<rect x="294" y="20" width="28" height="22"></rect>
-<text x="308" y="35">&#95;</text>
-</g>
-<path d="M322 31h10"></path>
-<path d="M332 31h10"></path>
-<g>
-<path d="M342 31h0"></path>
-<path d="M490 31h0"></path>
-<rect x="342" y="20" width="148" height="22" rx="10" ry="10"></rect>
-<text x="416" y="35">exponentOperator</text>
-</g>
-<path d="M490 31h10"></path>
-<path d="M500 31h10"></path>
-<g>
-<path d="M510 31h0"></path>
-<path d="M538 31h0"></path>
-<rect x="510" y="20" width="28" height="22"></rect>
-<text x="524" y="35">&#95;</text>
-</g>
-<path d="M538 31h10"></path>
-<path d="M548 31h10"></path>
-<g>
-<path d="M558 31h0"></path>
-<path d="M722 31h0"></path>
-<rect x="558" y="20" width="164" height="22"></rect>
-<text x="640" y="35">exponentExpression</text>
-</g>
-<path d="M722 31h10"></path>
-</g>
-<path d="M732 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h224"></path>
-<path d="M508 61h224"></path>
-<path d="M284 61h10"></path>
-<g>
-<path d="M294 61h0"></path>
-<path d="M498 61h0"></path>
-<rect x="294" y="50" width="204" height="22"></rect>
-<text x="396" y="65">parenthesizedExpression</text>
-</g>
-<path d="M498 61h10"></path>
-</g>
-<path d="M732 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 752 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>parenthesizedExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="465" height="92" viewBox="0 0 465 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M424 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M404 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M114 31h0"></path>
-<rect x="70" y="20" width="44" height="22" rx="10" ry="10"></rect>
-<text x="92" y="35">"("</text>
-</g>
-<path d="M114 31h10"></path>
-<path d="M124 31h10"></path>
-<g>
-<path d="M134 31h0"></path>
-<path d="M162 31h0"></path>
-<rect x="134" y="20" width="28" height="22"></rect>
-<text x="148" y="35">&#95;</text>
-</g>
-<path d="M162 31h10"></path>
-<path d="M172 31h10"></path>
-<g>
-<path d="M182 31h0"></path>
-<path d="M282 31h0"></path>
-<rect x="182" y="20" width="100" height="22"></rect>
-<text x="232" y="35">expression</text>
-</g>
-<path d="M282 31h10"></path>
-<path d="M292 31h10"></path>
-<g>
-<path d="M302 31h0"></path>
-<path d="M330 31h0"></path>
-<rect x="302" y="20" width="28" height="22"></rect>
-<text x="316" y="35">&#95;</text>
-</g>
-<path d="M330 31h10"></path>
-<path d="M340 31h10"></path>
-<g>
-<path d="M350 31h0"></path>
-<path d="M394 31h0"></path>
-<rect x="350" y="20" width="44" height="22" rx="10" ry="10"></rect>
-<text x="372" y="35">")"</text>
-</g>
-<path d="M394 31h10"></path>
-</g>
-<path d="M404 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h92"></path>
-<path d="M312 61h92"></path>
-<path d="M152 61h10"></path>
-<g>
-<path d="M162 61h0"></path>
-<path d="M302 61h0"></path>
-<rect x="162" y="50" width="140" height="22"></rect>
-<text x="232" y="65">valueExpression</text>
-</g>
-<path d="M302 61h10"></path>
-</g>
-<path d="M404 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 424 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>valueExpression</code></h1>
-<div>
-<svg class="railroad-diagram" width="209" height="122" viewBox="0 0 209 122">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M168 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h8"></path>
-<path d="M140 31h8"></path>
-<path d="M68 31h10"></path>
-<g>
-<path d="M78 31h0"></path>
-<path d="M130 31h0"></path>
-<rect x="78" y="20" width="52" height="22"></rect>
-<text x="104" y="35">name</text>
-</g>
-<path d="M130 31h10"></path>
-</g>
-<path d="M148 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h0"></path>
-<path d="M148 61h0"></path>
-<path d="M60 61h10"></path>
-<g>
-<path d="M70 61h0"></path>
-<path d="M138 61h0"></path>
-<rect x="70" y="50" width="68" height="22"></rect>
-<text x="104" y="65">number</text>
-</g>
-<path d="M138 61h10"></path>
-</g>
-<path d="M148 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-<path d="M40 31a10 10 0 0 1 10 10v40a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 91h0"></path>
-<path d="M148 91h0"></path>
-<path d="M60 91h10"></path>
-<g>
-<path d="M70 91h0"></path>
-<path d="M138 91h0"></path>
-<rect x="70" y="80" width="68" height="22"></rect>
-<text x="104" y="95">string</text>
-</g>
-<path d="M138 91h10"></path>
-</g>
-<path d="M148 91a10 10 0 0 0 10 -10v-40a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 168 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>number</code></h1>
-<div>
-<svg class="railroad-diagram" width="209" height="62" viewBox="0 0 209 62">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M168 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M148 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M138 31h0"></path>
-<rect x="70" y="20" width="68" height="22" rx="10" ry="10"></rect>
-<text x="104" y="35">number</text>
-</g>
-<path d="M138 31h10"></path>
-</g>
-<path d="M148 31h20"></path>
-</g>
-<path d="M 168 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>name</code></h1>
-<div>
-<svg class="railroad-diagram" width="193" height="62" viewBox="0 0 193 62">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M152 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M132 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M122 31h0"></path>
-<rect x="70" y="20" width="52" height="22" rx="10" ry="10"></rect>
-<text x="96" y="35">name</text>
-</g>
-<path d="M122 31h10"></path>
-</g>
-<path d="M132 31h20"></path>
-</g>
-<path d="M 152 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>string</code></h1>
-<div>
-<svg class="railroad-diagram" width="209" height="62" viewBox="0 0 209 62">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M168 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h0"></path>
-<path d="M148 31h0"></path>
-<path d="M60 31h10"></path>
-<g>
-<path d="M70 31h0"></path>
-<path d="M138 31h0"></path>
-<rect x="70" y="20" width="68" height="22" rx="10" ry="10"></rect>
-<text x="104" y="35">string</text>
-</g>
-<path d="M138 31h10"></path>
-</g>
-<path d="M148 31h20"></path>
-</g>
-<path d="M 168 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-<h1><code>_</code></h1>
-<div>
-<svg class="railroad-diagram" width="201" height="92" viewBox="0 0 201 92">
-<g transform="translate(.5 .5)">
-<path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
-<g>
-<path d="M40 31h0"></path>
-<path d="M160 31h0"></path>
-<path d="M40 31h20"></path>
-<g>
-<path d="M60 31h4"></path>
-<path d="M136 31h4"></path>
-<path d="M64 31h10"></path>
-<g>
-<path d="M74 31h0"></path>
-<path d="M126 31h0"></path>
-<rect x="74" y="20" width="52" height="22"></rect>
-<text x="100" y="35">null</text>
-</g>
-<path d="M126 31h10"></path>
-</g>
-<path d="M140 31h20"></path>
-<path d="M40 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path>
-<g>
-<path d="M60 61h0"></path>
-<path d="M140 61h0"></path>
-<path d="M60 61h10"></path>
-<g>
-<path d="M70 61h0"></path>
-<path d="M130 61h0"></path>
-<rect x="70" y="50" width="60" height="22" rx="10" ry="10"></rect>
-<text x="100" y="65">space</text>
-</g>
-<path d="M130 61h10"></path>
-</g>
-<path d="M140 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path>
-</g>
-<path d="M 160 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
-</g>
-</svg>
-
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/parser/package-lock.json b/parser/package-lock.json
deleted file mode 100644
index b48618db..00000000
--- a/parser/package-lock.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "dicecloud-parser",
-  "version": "0.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-      "dev": true
-    },
-    "discontinuous-range": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
-      "dev": true
-    },
-    "moo": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.0.tgz",
-      "integrity": "sha512-AMv6iqhTEd5vT/cQlH6cammKS5ekyHhyqTRKi5zKMWl1RTyFnQ3ohPSBNSm8ySe2wlxSKwDonr9D5ZT44mdO3g==",
-      "dev": true
-    },
-    "nearley": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.16.0.tgz",
-      "integrity": "sha512-Tr9XD3Vt/EujXbZBv6UAHYoLUSMQAxSsTnm9K3koXzjzNWY195NqALeyrzLZBKzAkL3gl92BcSogqrHjD8QuUg==",
-      "dev": true,
-      "requires": {
-        "commander": "2.19.0",
-        "moo": "0.4.3",
-        "railroad-diagrams": "1.0.0",
-        "randexp": "0.4.6",
-        "semver": "5.6.0"
-      },
-      "dependencies": {
-        "moo": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
-          "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==",
-          "dev": true
-        }
-      }
-    },
-    "railroad-diagrams": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
-      "dev": true
-    },
-    "randexp": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
-      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
-      "dev": true,
-      "requires": {
-        "discontinuous-range": "1.0.0",
-        "ret": "0.1.15"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-      "dev": true
-    }
-  }
-}
diff --git a/parser/package.json b/parser/package.json
deleted file mode 100644
index fc9d5f52..00000000
--- a/parser/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "dicecloud-parser",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "nearleyc grammar.ne -o grammar.js",
-    "test": "nearley-test grammar.js",
-    "unparse": "nearley-unparse grammar.js",
-    "railroad": "nearley-railroad grammar.ne -o grammar.html"
-  },
-  "author": "Stefan Zermatten",
-  "devDependencies": {
-    "moo": "^0.5.0",
-    "nearley": "^2.16.0"
-  }
-}