From 3f1ee22bbc8978886ccc7c36d1d7366f03a3cbf5 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Mon, 9 Mar 2020 18:19:31 +0100
Subject: [PATCH 01/43] Refactor Switch component to be a plugin.

---
 gitlab-pages/website/docusaurus.config.js     |    8 +-
 gitlab-pages/website/package.json             |    9 +-
 .../website/src/@ligo/syntax/output/index.js  |   12 +
 .../output/theme/Syntax/SyntaxContext.js      |    3 +
 .../output/theme/Syntax/SyntaxSwitch.js       |   18 +
 .../@ligo/syntax/output/theme/Syntax/index.js |   15 +
 .../output}/theme/Syntax/styles.module.css    |    0
 .../src/@ligo/syntax/package-lock.json        | 3449 +++++++++++++++++
 .../website/src/@ligo/syntax/package.json     |   28 +
 .../website/src/@ligo/syntax/src/index.js     |   11 +
 .../syntax/src}/theme/Syntax/SyntaxContext.js |    1 -
 .../syntax/src}/theme/Syntax/SyntaxSwitch.js  |    2 +-
 .../syntax/src}/theme/Syntax/index.js         |    2 +
 .../syntax/src/theme/Syntax/styles.module.css |   37 +
 .../website/src/theme/DocSidebar/index.js     |    2 +-
 15 files changed, 3589 insertions(+), 8 deletions(-)
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/output/index.js
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxContext.js
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxSwitch.js
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/index.js
 rename gitlab-pages/website/src/{ => @ligo/syntax/output}/theme/Syntax/styles.module.css (100%)
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/package-lock.json
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/package.json
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/src/index.js
 rename gitlab-pages/website/src/{ => @ligo/syntax/src}/theme/Syntax/SyntaxContext.js (99%)
 rename gitlab-pages/website/src/{ => @ligo/syntax/src}/theme/Syntax/SyntaxSwitch.js (92%)
 rename gitlab-pages/website/src/{ => @ligo/syntax/src}/theme/Syntax/index.js (93%)
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/styles.module.css

diff --git a/gitlab-pages/website/docusaurus.config.js b/gitlab-pages/website/docusaurus.config.js
index 5fd7c6ddd..9cab1f4ea 100644
--- a/gitlab-pages/website/docusaurus.config.js
+++ b/gitlab-pages/website/docusaurus.config.js
@@ -99,7 +99,6 @@ const siteConfig = {
   },*/
 
   // Add custom scripts here that would be placed in <script> tags.
-  scripts: ['https://buttons.github.io/buttons.js'],
 
   // On page navigation for the current documentation page.
   // No .html extensions for paths.
@@ -113,11 +112,12 @@ const siteConfig = {
   // You may provide arbitrary config keys to be used as needed by your
   // template. For example, if you need your repo's URL...
   // repoUrl: repoUrl,
-  stylesheets: [
-    'https://fonts.googleapis.com/css?family=DM+Sans:400,400i,500,500i,700,700i|Open+Sans:300,300i,400,600|Source+Code+Pro&display=swap'
+  plugins: [
+    '@ligo/syntax', {
+
+    }
   ],
   
-  
   presets: [
     [
       '@docusaurus/preset-classic',
diff --git a/gitlab-pages/website/package.json b/gitlab-pages/website/package.json
index 7ea236fdd..9082919de 100644
--- a/gitlab-pages/website/package.json
+++ b/gitlab-pages/website/package.json
@@ -14,11 +14,18 @@
     "webpack": "4.41.2"
   },
   "browserslist": {
-    "production": [">0.2%", "not dead", "not op_mini all"],
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
     "development": [
       "last 1 chrome version",
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "dependencies": {
+    "@ligo/syntax": "file:src/@ligo/syntax"
   }
 }
diff --git a/gitlab-pages/website/src/@ligo/syntax/output/index.js b/gitlab-pages/website/src/@ligo/syntax/output/index.js
new file mode 100644
index 000000000..272f29790
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/output/index.js
@@ -0,0 +1,12 @@
+const path = require('path');
+
+module.exports = function (context, options) {
+  return {
+    name: 'ligo-syntax-plugin',
+
+    getThemePath() {
+      return path.resolve(__dirname, './theme');
+    }
+
+  };
+};
\ No newline at end of file
diff --git a/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxContext.js b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxContext.js
new file mode 100644
index 000000000..c6d522b70
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxContext.js
@@ -0,0 +1,3 @@
+import React from 'react';
+const SyntaxContext = React.createContext('pascaligo');
+export default SyntaxContext;
\ No newline at end of file
diff --git a/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxSwitch.js b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxSwitch.js
new file mode 100644
index 000000000..eea544e69
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/SyntaxSwitch.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import styles from './styles.module.css';
+
+function SyntaxSwitch(props) {
+  return React.createElement("select", {
+    className: styles.syntaxSwitch,
+    defaultValue: props.syntax,
+    onChange: e => props.onSyntaxChange(e.target.value)
+  }, React.createElement("option", {
+    value: "pascaligo"
+  }, "PascaLIGO"), React.createElement("option", {
+    value: "cameligo"
+  }, "CameLIGO"), React.createElement("option", {
+    value: "reasonligo"
+  }, "ReasonLIGO"));
+}
+
+export default SyntaxSwitch;
\ No newline at end of file
diff --git a/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/index.js b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/index.js
new file mode 100644
index 000000000..bfec0dfc0
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import SyntaxContext from './SyntaxContext';
+
+function Syntax(props) {
+  return React.createElement(SyntaxContext.Consumer, null, syntax => {
+    if (syntax === props.syntax) {
+      return props.children;
+    } else {
+      return React.createElement(React.Fragment, null);
+    }
+  });
+}
+
+export default Syntax;
+export { SyntaxContext };
\ No newline at end of file
diff --git a/gitlab-pages/website/src/theme/Syntax/styles.module.css b/gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/styles.module.css
similarity index 100%
rename from gitlab-pages/website/src/theme/Syntax/styles.module.css
rename to gitlab-pages/website/src/@ligo/syntax/output/theme/Syntax/styles.module.css
diff --git a/gitlab-pages/website/src/@ligo/syntax/package-lock.json b/gitlab-pages/website/src/@ligo/syntax/package-lock.json
new file mode 100644
index 000000000..126bdb1c4
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/package-lock.json
@@ -0,0 +1,3449 @@
+{
+    "name": "@ligo/syntax",
+    "version": "0.0.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+        "@babel/cli": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz",
+            "integrity": "sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==",
+            "dev": true,
+            "requires": {
+                "chokidar": "^2.1.8",
+                "commander": "^4.0.1",
+                "convert-source-map": "^1.1.0",
+                "fs-readdir-recursive": "^1.1.0",
+                "glob": "^7.0.0",
+                "lodash": "^4.17.13",
+                "make-dir": "^2.1.0",
+                "slash": "^2.0.0",
+                "source-map": "^0.5.0"
+            }
+        },
+        "@babel/code-frame": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+            "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+            "dev": true,
+            "requires": {
+                "@babel/highlight": "^7.8.3"
+            }
+        },
+        "@babel/compat-data": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz",
+            "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.8.5",
+                "invariant": "^2.2.4",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/core": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
+            "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.8.3",
+                "@babel/generator": "^7.8.7",
+                "@babel/helpers": "^7.8.4",
+                "@babel/parser": "^7.8.7",
+                "@babel/template": "^7.8.6",
+                "@babel/traverse": "^7.8.6",
+                "@babel/types": "^7.8.7",
+                "convert-source-map": "^1.7.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.1",
+                "json5": "^2.1.0",
+                "lodash": "^4.17.13",
+                "resolve": "^1.3.2",
+                "semver": "^5.4.1",
+                "source-map": "^0.5.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "^2.1.1"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/generator": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.7.tgz",
+            "integrity": "sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.7",
+                "jsesc": "^2.5.1",
+                "lodash": "^4.17.13",
+                "source-map": "^0.5.0"
+            }
+        },
+        "@babel/helper-annotate-as-pure": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
+            "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
+            "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-explode-assignable-expression": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-builder-react-jsx": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz",
+            "integrity": "sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3",
+                "esutils": "^2.0.0"
+            }
+        },
+        "@babel/helper-call-delegate": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz",
+            "integrity": "sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-hoist-variables": "^7.8.3",
+                "@babel/traverse": "^7.8.3",
+                "@babel/types": "^7.8.7"
+            }
+        },
+        "@babel/helper-compilation-targets": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
+            "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.8.6",
+                "browserslist": "^4.9.1",
+                "invariant": "^2.2.4",
+                "levenary": "^1.1.1",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/helper-create-regexp-features-plugin": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz",
+            "integrity": "sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.8.3",
+                "@babel/helper-regex": "^7.8.3",
+                "regexpu-core": "^4.6.0"
+            }
+        },
+        "@babel/helper-define-map": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
+            "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.8.3",
+                "@babel/types": "^7.8.3",
+                "lodash": "^4.17.13"
+            }
+        },
+        "@babel/helper-explode-assignable-expression": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
+            "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
+            "dev": true,
+            "requires": {
+                "@babel/traverse": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-function-name": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+            "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-get-function-arity": "^7.8.3",
+                "@babel/template": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-get-function-arity": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+            "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-hoist-variables": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
+            "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-member-expression-to-functions": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+            "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-module-imports": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+            "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-module-transforms": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz",
+            "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.8.3",
+                "@babel/helper-replace-supers": "^7.8.6",
+                "@babel/helper-simple-access": "^7.8.3",
+                "@babel/helper-split-export-declaration": "^7.8.3",
+                "@babel/template": "^7.8.6",
+                "@babel/types": "^7.8.6",
+                "lodash": "^4.17.13"
+            }
+        },
+        "@babel/helper-optimise-call-expression": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+            "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-plugin-utils": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+            "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+            "dev": true
+        },
+        "@babel/helper-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
+            "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
+            "dev": true,
+            "requires": {
+                "lodash": "^4.17.13"
+            }
+        },
+        "@babel/helper-remap-async-to-generator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
+            "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.8.3",
+                "@babel/helper-wrap-function": "^7.8.3",
+                "@babel/template": "^7.8.3",
+                "@babel/traverse": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-replace-supers": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+            "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-member-expression-to-functions": "^7.8.3",
+                "@babel/helper-optimise-call-expression": "^7.8.3",
+                "@babel/traverse": "^7.8.6",
+                "@babel/types": "^7.8.6"
+            }
+        },
+        "@babel/helper-simple-access": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+            "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-split-export-declaration": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+            "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-wrap-function": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
+            "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.8.3",
+                "@babel/template": "^7.8.3",
+                "@babel/traverse": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helpers": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
+            "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.8.3",
+                "@babel/traverse": "^7.8.4",
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/highlight": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+            "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.0.0",
+                "esutils": "^2.0.2",
+                "js-tokens": "^4.0.0"
+            }
+        },
+        "@babel/parser": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz",
+            "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==",
+            "dev": true
+        },
+        "@babel/plugin-proposal-async-generator-functions": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
+            "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-remap-async-to-generator": "^7.8.3",
+                "@babel/plugin-syntax-async-generators": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
+            "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-json-strings": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-unicode-property-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz",
+            "integrity": "sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-jsx": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
+            "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
+            "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-arrow-functions": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
+            "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-async-to-generator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
+            "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-remap-async-to-generator": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
+            "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-block-scoping": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
+            "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "lodash": "^4.17.13"
+            }
+        },
+        "@babel/plugin-transform-classes": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz",
+            "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.8.3",
+                "@babel/helper-define-map": "^7.8.3",
+                "@babel/helper-function-name": "^7.8.3",
+                "@babel/helper-optimise-call-expression": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-replace-supers": "^7.8.6",
+                "@babel/helper-split-export-declaration": "^7.8.3",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/plugin-transform-computed-properties": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
+            "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-destructuring": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz",
+            "integrity": "sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-dotall-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
+            "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-duplicate-keys": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
+            "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
+            "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-for-of": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz",
+            "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-function-name": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
+            "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-literals": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
+            "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-member-expression-literals": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
+            "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-modules-amd": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz",
+            "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "babel-plugin-dynamic-import-node": "^2.3.0"
+            }
+        },
+        "@babel/plugin-transform-modules-commonjs": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz",
+            "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-simple-access": "^7.8.3",
+                "babel-plugin-dynamic-import-node": "^2.3.0"
+            }
+        },
+        "@babel/plugin-transform-modules-systemjs": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz",
+            "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-hoist-variables": "^7.8.3",
+                "@babel/helper-module-transforms": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "babel-plugin-dynamic-import-node": "^2.3.0"
+            }
+        },
+        "@babel/plugin-transform-modules-umd": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz",
+            "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
+            "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-new-target": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
+            "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-object-super": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
+            "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-replace-supers": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-parameters": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz",
+            "integrity": "sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-call-delegate": "^7.8.7",
+                "@babel/helper-get-function-arity": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-property-literals": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
+            "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-react-display-name": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz",
+            "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-react-jsx": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz",
+            "integrity": "sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-react-jsx": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-jsx": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-react-jsx-self": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz",
+            "integrity": "sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-jsx": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-react-jsx-source": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz",
+            "integrity": "sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-syntax-jsx": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-regenerator": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz",
+            "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==",
+            "dev": true,
+            "requires": {
+                "regenerator-transform": "^0.14.2"
+            }
+        },
+        "@babel/plugin-transform-reserved-words": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
+            "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-shorthand-properties": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
+            "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
+            "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-sticky-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
+            "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/helper-regex": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-template-literals": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
+            "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-typeof-symbol": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
+            "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-unicode-regex": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
+            "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/preset-env": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz",
+            "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.8.6",
+                "@babel/helper-compilation-targets": "^7.8.7",
+                "@babel/helper-module-imports": "^7.8.3",
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+                "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+                "@babel/plugin-proposal-json-strings": "^7.8.3",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+                "@babel/plugin-syntax-async-generators": "^7.8.0",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+                "@babel/plugin-syntax-json-strings": "^7.8.0",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+                "@babel/plugin-syntax-top-level-await": "^7.8.3",
+                "@babel/plugin-transform-arrow-functions": "^7.8.3",
+                "@babel/plugin-transform-async-to-generator": "^7.8.3",
+                "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+                "@babel/plugin-transform-block-scoping": "^7.8.3",
+                "@babel/plugin-transform-classes": "^7.8.6",
+                "@babel/plugin-transform-computed-properties": "^7.8.3",
+                "@babel/plugin-transform-destructuring": "^7.8.3",
+                "@babel/plugin-transform-dotall-regex": "^7.8.3",
+                "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+                "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+                "@babel/plugin-transform-for-of": "^7.8.6",
+                "@babel/plugin-transform-function-name": "^7.8.3",
+                "@babel/plugin-transform-literals": "^7.8.3",
+                "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+                "@babel/plugin-transform-modules-amd": "^7.8.3",
+                "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+                "@babel/plugin-transform-modules-systemjs": "^7.8.3",
+                "@babel/plugin-transform-modules-umd": "^7.8.3",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+                "@babel/plugin-transform-new-target": "^7.8.3",
+                "@babel/plugin-transform-object-super": "^7.8.3",
+                "@babel/plugin-transform-parameters": "^7.8.7",
+                "@babel/plugin-transform-property-literals": "^7.8.3",
+                "@babel/plugin-transform-regenerator": "^7.8.7",
+                "@babel/plugin-transform-reserved-words": "^7.8.3",
+                "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+                "@babel/plugin-transform-spread": "^7.8.3",
+                "@babel/plugin-transform-sticky-regex": "^7.8.3",
+                "@babel/plugin-transform-template-literals": "^7.8.3",
+                "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+                "@babel/plugin-transform-unicode-regex": "^7.8.3",
+                "@babel/types": "^7.8.7",
+                "browserslist": "^4.8.5",
+                "core-js-compat": "^3.6.2",
+                "invariant": "^2.2.2",
+                "levenary": "^1.1.1",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/preset-react": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.8.3.tgz",
+            "integrity": "sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3",
+                "@babel/plugin-transform-react-display-name": "^7.8.3",
+                "@babel/plugin-transform-react-jsx": "^7.8.3",
+                "@babel/plugin-transform-react-jsx-self": "^7.8.3",
+                "@babel/plugin-transform-react-jsx-source": "^7.8.3"
+            }
+        },
+        "@babel/runtime": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
+            "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
+            "dev": true,
+            "requires": {
+                "regenerator-runtime": "^0.13.4"
+            }
+        },
+        "@babel/template": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+            "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.8.3",
+                "@babel/parser": "^7.8.6",
+                "@babel/types": "^7.8.6"
+            }
+        },
+        "@babel/traverse": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
+            "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.8.3",
+                "@babel/generator": "^7.8.6",
+                "@babel/helper-function-name": "^7.8.3",
+                "@babel/helper-split-export-declaration": "^7.8.3",
+                "@babel/parser": "^7.8.6",
+                "@babel/types": "^7.8.6",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0",
+                "lodash": "^4.17.13"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "^2.1.1"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/types": {
+            "version": "7.8.7",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
+            "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
+            "dev": true,
+            "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.13",
+                "to-fast-properties": "^2.0.0"
+            }
+        },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^1.9.0"
+            }
+        },
+        "anymatch": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+            "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "micromatch": "^3.1.4",
+                "normalize-path": "^2.1.1"
+            },
+            "dependencies": {
+                "normalize-path": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "remove-trailing-separator": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "arr-diff": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+            "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+            "dev": true,
+            "optional": true
+        },
+        "arr-flatten": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+            "dev": true,
+            "optional": true
+        },
+        "arr-union": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+            "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+            "dev": true,
+            "optional": true
+        },
+        "array-unique": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+            "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+            "dev": true,
+            "optional": true
+        },
+        "assign-symbols": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+            "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+            "dev": true,
+            "optional": true
+        },
+        "async-each": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+            "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+            "dev": true,
+            "optional": true
+        },
+        "atob": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+            "dev": true,
+            "optional": true
+        },
+        "babel-plugin-dynamic-import-node": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+            "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+            "dev": true,
+            "requires": {
+                "object.assign": "^4.1.0"
+            }
+        },
+        "balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+            "dev": true
+        },
+        "base": {
+            "version": "0.11.2",
+            "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "cache-base": "^1.0.1",
+                "class-utils": "^0.3.5",
+                "component-emitter": "^1.2.1",
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.1",
+                "mixin-deep": "^1.2.0",
+                "pascalcase": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "binary-extensions": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+            "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+            "dev": true,
+            "optional": true
+        },
+        "bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
+        "brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "braces": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "browserslist": {
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
+            "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
+            "dev": true,
+            "requires": {
+                "caniuse-lite": "^1.0.30001030",
+                "electron-to-chromium": "^1.3.363",
+                "node-releases": "^1.1.50"
+            }
+        },
+        "cache-base": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "collection-visit": "^1.0.0",
+                "component-emitter": "^1.2.1",
+                "get-value": "^2.0.6",
+                "has-value": "^1.0.0",
+                "isobject": "^3.0.1",
+                "set-value": "^2.0.0",
+                "to-object-path": "^0.3.0",
+                "union-value": "^1.0.0",
+                "unset-value": "^1.0.0"
+            }
+        },
+        "caniuse-lite": {
+            "version": "1.0.30001033",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz",
+            "integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==",
+            "dev": true
+        },
+        "chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            }
+        },
+        "chokidar": {
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+            "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "anymatch": "^2.0.0",
+                "async-each": "^1.0.1",
+                "braces": "^2.3.2",
+                "fsevents": "^1.2.7",
+                "glob-parent": "^3.1.0",
+                "inherits": "^2.0.3",
+                "is-binary-path": "^1.0.0",
+                "is-glob": "^4.0.0",
+                "normalize-path": "^3.0.0",
+                "path-is-absolute": "^1.0.0",
+                "readdirp": "^2.2.1",
+                "upath": "^1.1.1"
+            }
+        },
+        "class-utils": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "define-property": "^0.2.5",
+                "isobject": "^3.0.0",
+                "static-extend": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "collection-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+            "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "map-visit": "^1.0.0",
+                "object-visit": "^1.0.0"
+            }
+        },
+        "color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "requires": {
+                "color-name": "1.1.3"
+            }
+        },
+        "color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+            "dev": true
+        },
+        "commander": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+            "dev": true
+        },
+        "component-emitter": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+            "dev": true,
+            "optional": true
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
+        },
+        "convert-source-map": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.1"
+            }
+        },
+        "copy-descriptor": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+            "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+            "dev": true,
+            "optional": true
+        },
+        "core-js-compat": {
+            "version": "3.6.4",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
+            "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.8.3",
+                "semver": "7.0.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+                    "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+                    "dev": true
+                }
+            }
+        },
+        "core-util-is": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "dev": true,
+            "optional": true
+        },
+        "debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "ms": "2.0.0"
+            }
+        },
+        "decode-uri-component": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+            "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+            "dev": true,
+            "optional": true
+        },
+        "define-properties": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+            "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+            "dev": true,
+            "requires": {
+                "object-keys": "^1.0.12"
+            }
+        },
+        "define-property": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-descriptor": "^1.0.2",
+                "isobject": "^3.0.1"
+            },
+            "dependencies": {
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "electron-to-chromium": {
+            "version": "1.3.372",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz",
+            "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "dev": true
+        },
+        "esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true
+        },
+        "expand-brackets": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+            "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "debug": "^2.3.3",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "posix-character-classes": "^0.1.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "extend-shallow": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+            "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                }
+            }
+        },
+        "extglob": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "array-unique": "^0.3.2",
+                "define-property": "^1.0.0",
+                "expand-brackets": "^2.1.4",
+                "extend-shallow": "^2.0.1",
+                "fragment-cache": "^0.2.1",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "dev": true,
+            "optional": true
+        },
+        "fill-range": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+            "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1",
+                "to-regex-range": "^2.1.0"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "for-in": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+            "dev": true,
+            "optional": true
+        },
+        "fragment-cache": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+            "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "map-cache": "^0.2.2"
+            }
+        },
+        "fs-readdir-recursive": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+            "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+            "dev": true
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true
+        },
+        "fsevents": {
+            "version": "1.2.11",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+            "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "bindings": "^1.5.0",
+                "nan": "^2.12.1",
+                "node-pre-gyp": "*"
+            },
+            "dependencies": {
+                "abbrev": {
+                    "version": "1.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "aproba": {
+                    "version": "1.2.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "are-we-there-yet": {
+                    "version": "1.1.5",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "delegates": "^1.0.0",
+                        "readable-stream": "^2.0.6"
+                    }
+                },
+                "balanced-match": {
+                    "version": "1.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "chownr": {
+                    "version": "1.1.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "code-point-at": {
+                    "version": "1.1.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "concat-map": {
+                    "version": "0.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "console-control-strings": {
+                    "version": "1.1.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "core-util-is": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "debug": {
+                    "version": "3.2.6",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ms": "^2.1.1"
+                    }
+                },
+                "deep-extend": {
+                    "version": "0.6.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "delegates": {
+                    "version": "1.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "detect-libc": {
+                    "version": "1.0.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "fs-minipass": {
+                    "version": "1.2.7",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minipass": "^2.6.0"
+                    }
+                },
+                "fs.realpath": {
+                    "version": "1.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "gauge": {
+                    "version": "2.7.4",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "aproba": "^1.0.3",
+                        "console-control-strings": "^1.0.0",
+                        "has-unicode": "^2.0.0",
+                        "object-assign": "^4.1.0",
+                        "signal-exit": "^3.0.0",
+                        "string-width": "^1.0.1",
+                        "strip-ansi": "^3.0.1",
+                        "wide-align": "^1.1.0"
+                    }
+                },
+                "glob": {
+                    "version": "7.1.6",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.0.4",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "has-unicode": {
+                    "version": "2.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "iconv-lite": {
+                    "version": "0.4.24",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "safer-buffer": ">= 2.1.2 < 3"
+                    }
+                },
+                "ignore-walk": {
+                    "version": "3.0.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minimatch": "^3.0.4"
+                    }
+                },
+                "inflight": {
+                    "version": "1.0.6",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "once": "^1.3.0",
+                        "wrappy": "1"
+                    }
+                },
+                "inherits": {
+                    "version": "2.0.4",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "ini": {
+                    "version": "1.3.5",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "isarray": {
+                    "version": "1.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "minimatch": {
+                    "version": "3.0.4",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                },
+                "minimist": {
+                    "version": "0.0.8",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "minipass": {
+                    "version": "2.9.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "safe-buffer": "^5.1.2",
+                        "yallist": "^3.0.0"
+                    }
+                },
+                "minizlib": {
+                    "version": "1.3.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minipass": "^2.9.0"
+                    }
+                },
+                "mkdirp": {
+                    "version": "0.5.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "minimist": "0.0.8"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "needle": {
+                    "version": "2.4.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "debug": "^3.2.6",
+                        "iconv-lite": "^0.4.4",
+                        "sax": "^1.2.4"
+                    }
+                },
+                "node-pre-gyp": {
+                    "version": "0.14.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "detect-libc": "^1.0.2",
+                        "mkdirp": "^0.5.1",
+                        "needle": "^2.2.1",
+                        "nopt": "^4.0.1",
+                        "npm-packlist": "^1.1.6",
+                        "npmlog": "^4.0.2",
+                        "rc": "^1.2.7",
+                        "rimraf": "^2.6.1",
+                        "semver": "^5.3.0",
+                        "tar": "^4.4.2"
+                    }
+                },
+                "nopt": {
+                    "version": "4.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "abbrev": "1",
+                        "osenv": "^0.1.4"
+                    }
+                },
+                "npm-bundled": {
+                    "version": "1.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "npm-normalize-package-bin": "^1.0.1"
+                    }
+                },
+                "npm-normalize-package-bin": {
+                    "version": "1.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "npm-packlist": {
+                    "version": "1.4.7",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ignore-walk": "^3.0.1",
+                        "npm-bundled": "^1.0.1"
+                    }
+                },
+                "npmlog": {
+                    "version": "4.1.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "are-we-there-yet": "~1.1.2",
+                        "console-control-strings": "~1.1.0",
+                        "gauge": "~2.7.3",
+                        "set-blocking": "~2.0.0"
+                    }
+                },
+                "number-is-nan": {
+                    "version": "1.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "object-assign": {
+                    "version": "4.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "once": {
+                    "version": "1.4.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "wrappy": "1"
+                    }
+                },
+                "os-homedir": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "os-tmpdir": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "osenv": {
+                    "version": "0.1.5",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "os-homedir": "^1.0.0",
+                        "os-tmpdir": "^1.0.0"
+                    }
+                },
+                "path-is-absolute": {
+                    "version": "1.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "process-nextick-args": {
+                    "version": "2.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "rc": {
+                    "version": "1.2.8",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "deep-extend": "^0.6.0",
+                        "ini": "~1.3.0",
+                        "minimist": "^1.2.0",
+                        "strip-json-comments": "~2.0.1"
+                    },
+                    "dependencies": {
+                        "minimist": {
+                            "version": "1.2.0",
+                            "bundled": true,
+                            "dev": true,
+                            "optional": true
+                        }
+                    }
+                },
+                "readable-stream": {
+                    "version": "2.3.6",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "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"
+                    }
+                },
+                "rimraf": {
+                    "version": "2.7.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "glob": "^7.1.3"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.1.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "safer-buffer": {
+                    "version": "2.1.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "sax": {
+                    "version": "1.2.4",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "semver": {
+                    "version": "5.7.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "set-blocking": {
+                    "version": "2.0.0",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "signal-exit": {
+                    "version": "3.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "string_decoder": {
+                    "version": "1.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                },
+                "strip-json-comments": {
+                    "version": "2.0.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "tar": {
+                    "version": "4.4.13",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "chownr": "^1.1.1",
+                        "fs-minipass": "^1.2.5",
+                        "minipass": "^2.8.6",
+                        "minizlib": "^1.2.1",
+                        "mkdirp": "^0.5.0",
+                        "safe-buffer": "^5.1.2",
+                        "yallist": "^3.0.3"
+                    }
+                },
+                "util-deprecate": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "wide-align": {
+                    "version": "1.1.3",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "string-width": "^1.0.2 || 2"
+                    }
+                },
+                "wrappy": {
+                    "version": "1.0.2",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                },
+                "yallist": {
+                    "version": "3.1.1",
+                    "bundled": true,
+                    "dev": true,
+                    "optional": true
+                }
+            }
+        },
+        "function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+            "dev": true
+        },
+        "gensync": {
+            "version": "1.0.0-beta.1",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+            "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+            "dev": true
+        },
+        "get-value": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+            "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+            "dev": true,
+            "optional": true
+        },
+        "glob": {
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            }
+        },
+        "glob-parent": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+            "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-glob": "^3.1.0",
+                "path-dirname": "^1.0.0"
+            },
+            "dependencies": {
+                "is-glob": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extglob": "^2.1.0"
+                    }
+                }
+            }
+        },
+        "globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "dev": true
+        },
+        "graceful-fs": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+            "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+            "dev": true,
+            "optional": true
+        },
+        "has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "dev": true
+        },
+        "has-symbols": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+            "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+            "dev": true
+        },
+        "has-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+            "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "get-value": "^2.0.6",
+                "has-values": "^1.0.0",
+                "isobject": "^3.0.0"
+            }
+        },
+        "has-values": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+            "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "kind-of": "^4.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+                    "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "invariant": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+            "dev": true,
+            "requires": {
+                "loose-envify": "^1.0.0"
+            }
+        },
+        "is-accessor-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-binary-path": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+            "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "binary-extensions": "^1.0.0"
+            }
+        },
+        "is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true,
+            "optional": true
+        },
+        "is-data-descriptor": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true,
+                    "optional": true
+                }
+            }
+        },
+        "is-extendable": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+            "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+            "dev": true,
+            "optional": true
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "dev": true,
+            "optional": true
+        },
+        "is-glob": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-number": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+            "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-plain-object": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "is-windows": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+            "dev": true,
+            "optional": true
+        },
+        "isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+            "dev": true,
+            "optional": true
+        },
+        "isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+            "dev": true,
+            "optional": true
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true
+        },
+        "json5": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+            "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.2.0"
+            }
+        },
+        "kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true,
+            "optional": true
+        },
+        "leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true
+        },
+        "levenary": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+            "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+            "dev": true,
+            "requires": {
+                "leven": "^3.1.0"
+            }
+        },
+        "lodash": {
+            "version": "4.17.15",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+            "dev": true
+        },
+        "loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "dev": true,
+            "requires": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            }
+        },
+        "make-dir": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+            "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+            "dev": true,
+            "requires": {
+                "pify": "^4.0.1",
+                "semver": "^5.6.0"
+            }
+        },
+        "map-cache": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+            "dev": true,
+            "optional": true
+        },
+        "map-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+            "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "object-visit": "^1.0.0"
+            }
+        },
+        "micromatch": {
+            "version": "3.1.10",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "braces": "^2.3.1",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "extglob": "^2.0.4",
+                "fragment-cache": "^0.2.1",
+                "kind-of": "^6.0.2",
+                "nanomatch": "^1.2.9",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.2"
+            }
+        },
+        "minimatch": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^1.1.7"
+            }
+        },
+        "minimist": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+            "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+            "dev": true
+        },
+        "mixin-deep": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+            "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "for-in": "^1.0.2",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                }
+            }
+        },
+        "ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+            "dev": true,
+            "optional": true
+        },
+        "nan": {
+            "version": "2.14.0",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+            "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+            "dev": true,
+            "optional": true
+        },
+        "nanomatch": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+            "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "fragment-cache": "^0.2.1",
+                "is-windows": "^1.0.2",
+                "kind-of": "^6.0.2",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            }
+        },
+        "node-releases": {
+            "version": "1.1.51",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.51.tgz",
+            "integrity": "sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==",
+            "dev": true,
+            "requires": {
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                }
+            }
+        },
+        "normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "optional": true
+        },
+        "object-copy": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+            "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "copy-descriptor": "^0.1.0",
+                "define-property": "^0.2.5",
+                "kind-of": "^3.0.3"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true
+        },
+        "object-visit": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+            "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "isobject": "^3.0.0"
+            }
+        },
+        "object.assign": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+            "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.2",
+                "function-bind": "^1.1.1",
+                "has-symbols": "^1.0.0",
+                "object-keys": "^1.0.11"
+            }
+        },
+        "object.pick": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "pascalcase": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+            "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+            "dev": true,
+            "optional": true
+        },
+        "path-dirname": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+            "dev": true,
+            "optional": true
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
+        },
+        "path-parse": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+            "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+            "dev": true
+        },
+        "pify": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+            "dev": true
+        },
+        "posix-character-classes": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+            "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+            "dev": true,
+            "optional": true
+        },
+        "prism-react-renderer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.0.2.tgz",
+            "integrity": "sha512-0++pJyRfu4v2OxI/Us/5RLui9ESDkTiLkVCtKuPZYdpB8UQWJpnJQhPrWab053XtsKW3oM0sD69uJ6N9exm1Ag==",
+            "dev": true
+        },
+        "private": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+            "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+            "dev": true
+        },
+        "process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true,
+            "optional": true
+        },
+        "readable-stream": {
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+            "dev": true,
+            "optional": true,
+            "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"
+            }
+        },
+        "readdirp": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+            "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "graceful-fs": "^4.1.11",
+                "micromatch": "^3.1.10",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "regenerate": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+            "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+            "dev": true
+        },
+        "regenerate-unicode-properties": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+            "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.0"
+            }
+        },
+        "regenerator-runtime": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz",
+            "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==",
+            "dev": true
+        },
+        "regenerator-transform": {
+            "version": "0.14.2",
+            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz",
+            "integrity": "sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==",
+            "dev": true,
+            "requires": {
+                "@babel/runtime": "^7.8.4",
+                "private": "^0.1.8"
+            }
+        },
+        "regex-not": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "regexpu-core": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+            "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.0",
+                "regenerate-unicode-properties": "^8.1.0",
+                "regjsgen": "^0.5.0",
+                "regjsparser": "^0.6.0",
+                "unicode-match-property-ecmascript": "^1.0.4",
+                "unicode-match-property-value-ecmascript": "^1.1.0"
+            }
+        },
+        "regjsgen": {
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+            "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+            "dev": true
+        },
+        "regjsparser": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz",
+            "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==",
+            "dev": true,
+            "requires": {
+                "jsesc": "~0.5.0"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+                    "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+                    "dev": true
+                }
+            }
+        },
+        "remove-trailing-separator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+            "dev": true,
+            "optional": true
+        },
+        "repeat-element": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+            "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+            "dev": true,
+            "optional": true
+        },
+        "repeat-string": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+            "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+            "dev": true,
+            "optional": true
+        },
+        "resolve": {
+            "version": "1.15.1",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+            "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+            "dev": true,
+            "requires": {
+                "path-parse": "^1.0.6"
+            }
+        },
+        "resolve-url": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+            "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+            "dev": true,
+            "optional": true
+        },
+        "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,
+            "optional": true
+        },
+        "safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "safe-regex": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "ret": "~0.1.10"
+            }
+        },
+        "semver": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "dev": true
+        },
+        "set-value": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+            "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-extendable": "^0.1.1",
+                "is-plain-object": "^2.0.3",
+                "split-string": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "slash": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+            "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+            "dev": true
+        },
+        "snapdragon": {
+            "version": "0.8.2",
+            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "snapdragon-node": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.0",
+                "snapdragon-util": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "snapdragon-util": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "kind-of": "^3.2.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "source-map": {
+            "version": "0.5.7",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+            "dev": true
+        },
+        "source-map-resolve": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+            "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "atob": "^2.1.2",
+                "decode-uri-component": "^0.2.0",
+                "resolve-url": "^0.2.1",
+                "source-map-url": "^0.4.0",
+                "urix": "^0.1.0"
+            }
+        },
+        "source-map-url": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+            "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+            "dev": true,
+            "optional": true
+        },
+        "split-string": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "extend-shallow": "^3.0.0"
+            }
+        },
+        "static-extend": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+            "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "define-property": "^0.2.5",
+                "object-copy": "^0.1.0"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "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==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "requires": {
+                "has-flag": "^3.0.0"
+            }
+        },
+        "to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+            "dev": true
+        },
+        "to-object-path": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+            "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "to-regex": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "to-regex-range": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+            "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+            }
+        },
+        "unicode-canonical-property-names-ecmascript": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+            "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+            "dev": true
+        },
+        "unicode-match-property-ecmascript": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+            "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+            "dev": true,
+            "requires": {
+                "unicode-canonical-property-names-ecmascript": "^1.0.4",
+                "unicode-property-aliases-ecmascript": "^1.0.4"
+            }
+        },
+        "unicode-match-property-value-ecmascript": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+            "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+            "dev": true
+        },
+        "unicode-property-aliases-ecmascript": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+            "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+            "dev": true
+        },
+        "union-value": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+            "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "get-value": "^2.0.6",
+                "is-extendable": "^0.1.1",
+                "set-value": "^2.0.1"
+            }
+        },
+        "unset-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+            "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "has-value": "^0.3.1",
+                "isobject": "^3.0.0"
+            },
+            "dependencies": {
+                "has-value": {
+                    "version": "0.3.1",
+                    "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+                    "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "get-value": "^2.0.3",
+                        "has-values": "^0.1.4",
+                        "isobject": "^2.0.0"
+                    },
+                    "dependencies": {
+                        "isobject": {
+                            "version": "2.1.0",
+                            "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+                            "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+                            "dev": true,
+                            "optional": true,
+                            "requires": {
+                                "isarray": "1.0.0"
+                            }
+                        }
+                    }
+                },
+                "has-values": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+                    "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+                    "dev": true,
+                    "optional": true
+                }
+            }
+        },
+        "upath": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+            "dev": true,
+            "optional": true
+        },
+        "urix": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+            "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+            "dev": true,
+            "optional": true
+        },
+        "use": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+            "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+            "dev": true,
+            "optional": true
+        },
+        "util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+            "dev": true,
+            "optional": true
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
+        }
+    }
+}
diff --git a/gitlab-pages/website/src/@ligo/syntax/package.json b/gitlab-pages/website/src/@ligo/syntax/package.json
new file mode 100644
index 000000000..364300bfc
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/package.json
@@ -0,0 +1,28 @@
+{
+    "name": "@ligo/syntax",
+    "description": "Switch between different syntaxes",
+    "version": "0.0.0",
+    "main": "output/index.js",
+    "peerDependencies": {
+        "@docusaurus/core": "^2.0.0-alpha.43",
+        "@docusaurus/preset-classic": "^2.0.0-alpha.43",
+        "react": "^16.8.4",
+        "react-dom": "^16.8.4",
+        "webpack": "4.41.2"
+    },
+    "devDependencies": {
+        "@babel/cli": "^7.8.4",
+        "@babel/core": "^7.8.7",
+        "@babel/preset-env": "^7.8.7",
+        "@babel/preset-react": "^7.8.3",
+        "prism-react-renderer": "^1.0.2"
+    },
+    "babel": {
+        "presets": [
+            "@babel/preset-react"
+        ]
+    },
+    "scripts": {
+        "build": "rm -rf output && mkdir output && node_modules/.bin/babel src/theme/Syntax/*.js -d output/theme/Syntax/ && node_modules/.bin/babel src/theme/SyntaxTitle/*.js -d output/theme/SyntaxTitle/ &&  node_modules/.bin/babel src/*.js -d output/ && cp ./src/theme/Syntax/styles.module.css output/theme/Syntax/"
+    }
+}
diff --git a/gitlab-pages/website/src/@ligo/syntax/src/index.js b/gitlab-pages/website/src/@ligo/syntax/src/index.js
new file mode 100644
index 000000000..782eb2873
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/src/index.js
@@ -0,0 +1,11 @@
+const path = require('path');
+
+module.exports = function(context, options) {
+    return {
+        name: 'ligo-syntax-plugin',
+
+        getThemePath() {
+            return path.resolve(__dirname, './theme');
+        }
+    }
+}
\ No newline at end of file
diff --git a/gitlab-pages/website/src/theme/Syntax/SyntaxContext.js b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxContext.js
similarity index 99%
rename from gitlab-pages/website/src/theme/Syntax/SyntaxContext.js
rename to gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxContext.js
index a336f202b..ceda342d9 100644
--- a/gitlab-pages/website/src/theme/Syntax/SyntaxContext.js
+++ b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxContext.js
@@ -3,4 +3,3 @@ import React from 'react';
 const SyntaxContext = React.createContext('pascaligo');
 
 export default SyntaxContext;
-
diff --git a/gitlab-pages/website/src/theme/Syntax/SyntaxSwitch.js b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxSwitch.js
similarity index 92%
rename from gitlab-pages/website/src/theme/Syntax/SyntaxSwitch.js
rename to gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxSwitch.js
index c8d2b2289..f0e742b66 100644
--- a/gitlab-pages/website/src/theme/Syntax/SyntaxSwitch.js
+++ b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/SyntaxSwitch.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 import styles from './styles.module.css';
 
-function SyntaxSwitch (props) {   
+function SyntaxSwitch (props) {
     return (
         <select className={styles.syntaxSwitch}  defaultValue={props.syntax} onChange={e => props.onSyntaxChange(e.target.value)}>
             <option value="pascaligo">PascaLIGO</option>
diff --git a/gitlab-pages/website/src/theme/Syntax/index.js b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/index.js
similarity index 93%
rename from gitlab-pages/website/src/theme/Syntax/index.js
rename to gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/index.js
index a77cf145a..5167a31bc 100644
--- a/gitlab-pages/website/src/theme/Syntax/index.js
+++ b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/index.js
@@ -16,3 +16,5 @@ function Syntax(props) {
 }
 
 export default Syntax
+
+export { SyntaxContext }
\ No newline at end of file
diff --git a/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/styles.module.css b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/styles.module.css
new file mode 100644
index 000000000..8875a80fb
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/src/theme/Syntax/styles.module.css
@@ -0,0 +1,37 @@
+  .syntaxSwitch {
+    display: block;
+    font-size: 1rem;
+    font-weight: bold;
+    line-height: 1rem;
+    padding: .6em 1.4em .5em .8em;
+    box-sizing: border-box;
+    border: none;
+    color: var(--color-primary-text);
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    appearance: none;
+    background-color: transparent;
+    background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23007CB2%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E');
+    background-repeat: no-repeat, repeat;
+    background-position: right .7em top 50%, 0 0;
+    background-size: .65em auto, 100%;
+  }
+  .syntaxSwitch::-ms-expand {
+      display: none;
+  }
+  .syntaxSwitch:hover {
+      border-color: #888;
+  }
+  .syntaxSwitch:focus {
+      border-color: #aaa;
+      box-shadow: 0 0 1px 3px rgba(59, 153, 252, .7);
+      box-shadow: 0 0 0 3px -moz-mac-focusring;
+      color: var(--color-primary-text); 
+      outline: none; 
+  }
+  .syntaxSwitch option {
+      color: var(--color-primary-text);
+      font-weight:normal;
+  }
+  
+  
\ No newline at end of file
diff --git a/gitlab-pages/website/src/theme/DocSidebar/index.js b/gitlab-pages/website/src/theme/DocSidebar/index.js
index 449531096..d061259c3 100644
--- a/gitlab-pages/website/src/theme/DocSidebar/index.js
+++ b/gitlab-pages/website/src/theme/DocSidebar/index.js
@@ -15,7 +15,7 @@ import isInternalUrl from '@docusaurus/utils'; // eslint-disable-line import/no-
 
 import styles from './styles.module.css';
 
-import SyntaxSwitch from '../Syntax/SyntaxSwitch';
+import SyntaxSwitch from '@theme/Syntax/SyntaxSwitch';
 
 
 const MOBILE_TOGGLE_SIZE = 24;

From 6da6fc2e5991bc0be6b00531219d4aee5ff1a150 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Mon, 9 Mar 2020 18:19:46 +0100
Subject: [PATCH 02/43] Add SyntaxTitle component.

---
 .../syntax/output/theme/SyntaxTitle/index.js  | 111 +++++++++++++++
 .../syntax/src/theme/SyntaxTitle/index.js     | 126 ++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/output/theme/SyntaxTitle/index.js
 create mode 100644 gitlab-pages/website/src/@ligo/syntax/src/theme/SyntaxTitle/index.js

diff --git a/gitlab-pages/website/src/@ligo/syntax/output/theme/SyntaxTitle/index.js b/gitlab-pages/website/src/@ligo/syntax/output/theme/SyntaxTitle/index.js
new file mode 100644
index 000000000..b607008aa
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/output/theme/SyntaxTitle/index.js
@@ -0,0 +1,111 @@
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+import React, { useEffect, useState, useRef } from 'react';
+import Highlight, { defaultProps } from "prism-react-renderer"; // THE PROBLEM IS USE THEME CONTEXT ==>>>>
+
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import useThemeContext from '@theme/hooks/useThemeContext';
+import { SyntaxContext } from '@theme/Syntax';
+import defaultTheme from 'prism-react-renderer/themes/palenight';
+
+const {
+  Prism
+} = require("prism-react-renderer");
+
+Prism.languages = { ...Prism.languages,
+  pascaligo: {
+    'comment': [/\(\*[\s\S]+?\*\)/, // /\{[\s\S]+?\}/,
+    /\/\/.*/],
+    'string': {
+      pattern: /(?:'(?:''|[^'\r\n])*'|#[&$%]?[a-f\d]+)+|\^[a-z]/i,
+      greedy: true
+    },
+    'keyword': [{
+      // Turbo Pascal
+      pattern: /(^|[^&])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,
+      lookbehind: true
+    }, {
+      // Free Pascal
+      pattern: /(^|[^&])\b(?:dispose|exit|false|new|true)\b/i,
+      lookbehind: true
+    }, {
+      // Object Pascal
+      pattern: /(^|[^&])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,
+      lookbehind: true
+    }, {
+      // Modifiers
+      pattern: /(^|[^&])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,
+      lookbehind: true
+    }],
+    'number': [// Hexadecimal, octal and binary
+    /(?:[&%]\d+|\$[a-f\d]+)/i, // Decimal
+    /\b\d+(?:\.\d+)?(?:e[+-]?\d+)?/i],
+    'operator': [/\.\.|\*\*|:=|<[<=>]?|>[>=]?|[+\-*\/]=?|[@^=]/i, {
+      pattern: /(^|[^&])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,
+      lookbehind: true
+    }],
+    'punctuation': /\(\.|\.\)|[()\[\]:;,.]/
+  },
+  reasonligo: { ...Prism.languages.reason,
+    'comment': [/(^|[^\\])\/\*[\s\S]*?\*\//, /\(\*[\s\S]*?\*\)/, /\/\/.*/]
+  },
+  cameligo: { ...Prism.languages.ocaml,
+    'comment': [/(^|[^\\])\/\*[\s\S]*?\*\//, /\(\*[\s\S]*?\*\)/, /\/\/.*/]
+  }
+};
+
+function SyntaxTitle(props) {
+  const {
+    siteConfig: {
+      themeConfig: {
+        prism = {}
+      }
+    }
+  } = useDocusaurusContext();
+  const {
+    isDarkTheme
+  } = useThemeContext();
+  const lightModeTheme = prism.theme || defaultTheme;
+  const darkModeTheme = prism.darkTheme || lightModeTheme;
+  const prismTheme = isDarkTheme ? darkModeTheme : lightModeTheme;
+  const [mounted, setMounted] = useState(false);
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+  return React.createElement(SyntaxContext.Consumer, null, syntax => {
+    if (syntax === props.syntax) {
+      return React.createElement(Highlight, _extends({}, defaultProps, {
+        key: mounted,
+        language: props.syntax,
+        code: props.children,
+        theme: prismTheme
+      }), ({
+        className,
+        style,
+        tokens,
+        getLineProps,
+        getTokenProps
+      }) => React.createElement("pre", {
+        className: className,
+        style: {
+          backgroundColor: 'var(--ifm-background-color)',
+          fontSize: '1.1rem',
+          fontWeight: 'bold',
+          padding: 0,
+          whiteSpace: 'break-spaces',
+          marginTop: '3rem'
+        }
+      }, tokens.map((line, i) => React.createElement("div", getLineProps({
+        line,
+        key: i
+      }), line.map((token, key) => React.createElement("span", getTokenProps({
+        token,
+        key
+      })))))));
+    } else {
+      return React.createElement("div", null);
+    }
+  });
+}
+
+export default SyntaxTitle;
\ No newline at end of file
diff --git a/gitlab-pages/website/src/@ligo/syntax/src/theme/SyntaxTitle/index.js b/gitlab-pages/website/src/@ligo/syntax/src/theme/SyntaxTitle/index.js
new file mode 100644
index 000000000..1794c5800
--- /dev/null
+++ b/gitlab-pages/website/src/@ligo/syntax/src/theme/SyntaxTitle/index.js
@@ -0,0 +1,126 @@
+import React, {useEffect, useState, useRef} from 'react';
+import Highlight, { defaultProps } from "prism-react-renderer";
+
+// THE PROBLEM IS USE THEME CONTEXT ==>>>>
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import useThemeContext from '@theme/hooks/useThemeContext';
+
+import { SyntaxContext } from '@theme/Syntax';
+
+import defaultTheme from 'prism-react-renderer/themes/palenight';
+
+const {Prism} = require("prism-react-renderer");
+
+Prism.languages = {
+  ...Prism.languages,
+  pascaligo: {
+    'comment': [
+      /\(\*[\s\S]+?\*\)/,
+      // /\{[\s\S]+?\}/,
+      /\/\/.*/
+    ],
+    'string': {
+      pattern: /(?:'(?:''|[^'\r\n])*'|#[&$%]?[a-f\d]+)+|\^[a-z]/i,
+      greedy: true
+    },
+    'keyword': [
+      {
+        // Turbo Pascal
+        pattern: /(^|[^&])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,
+        lookbehind: true
+      },
+      {
+        // Free Pascal
+        pattern: /(^|[^&])\b(?:dispose|exit|false|new|true)\b/i,
+        lookbehind: true
+      },
+      {
+        // Object Pascal
+        pattern: /(^|[^&])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,
+        lookbehind: true
+      },
+      {
+        // Modifiers
+        pattern: /(^|[^&])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,
+        lookbehind: true
+      }
+    ],
+    'number': [
+      // Hexadecimal, octal and binary
+      /(?:[&%]\d+|\$[a-f\d]+)/i,
+      // Decimal
+      /\b\d+(?:\.\d+)?(?:e[+-]?\d+)?/i
+    ],
+    'operator': [
+      /\.\.|\*\*|:=|<[<=>]?|>[>=]?|[+\-*\/]=?|[@^=]/i,
+      {
+        pattern: /(^|[^&])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,
+        lookbehind: true
+      }
+    ],
+    'punctuation': /\(\.|\.\)|[()\[\]:;,.]/
+  },
+  reasonligo: 
+  {...Prism.languages.reason, 
+    'comment': [
+      /(^|[^\\])\/\*[\s\S]*?\*\//,
+      /\(\*[\s\S]*?\*\)/,   
+      /\/\/.*/   
+    ]
+      
+  },
+  cameligo: {
+    ...Prism.languages.ocaml, 
+    'comment': [
+      /(^|[^\\])\/\*[\s\S]*?\*\//,
+      /\(\*[\s\S]*?\*\)/,   
+      /\/\/.*/   
+    ]}
+};
+
+
+function SyntaxTitle(props) {
+  const {
+    siteConfig: {
+      themeConfig: {prism = {}},
+    }
+  } = useDocusaurusContext();
+  const {isDarkTheme} = useThemeContext();
+  const lightModeTheme = prism.theme || defaultTheme;
+  const darkModeTheme = prism.darkTheme || lightModeTheme;
+  const prismTheme = isDarkTheme ? darkModeTheme : lightModeTheme;
+
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  return (
+    <SyntaxContext.Consumer>
+      {(syntax => {
+        if (syntax === props.syntax) {
+          return ( 
+            <Highlight {...defaultProps} key={mounted} language={props.syntax} code={props.children} theme={prismTheme}>
+              {({ className, style, tokens, getLineProps, getTokenProps }) => (
+                  <pre className={className} style={{backgroundColor: 'var(--ifm-background-color)', fontSize: '1.1rem', fontWeight: 'bold', padding: 0, whiteSpace: 'break-spaces', marginTop: '3rem' }}>
+                    {tokens.map((line, i) => (
+                        <div {...getLineProps({ line, key: i })}>
+                        {line.map((token, key) => (
+                            <span {...getTokenProps({ token, key })} />
+                        ))}
+                        </div>
+                    ))}
+                    </pre>
+                )}
+            </Highlight>
+            )
+        } else {
+          return <div></div>
+        }
+      })}
+    </SyntaxContext.Consumer>
+  );
+}
+
+export default SyntaxTitle;
\ No newline at end of file

From 19848c2f67011c890014303e0e2b602baa35d6c4 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Mon, 9 Mar 2020 18:20:21 +0100
Subject: [PATCH 03/43] Big_map: first example of syntax specific titles.

---
 gitlab-pages/docs/reference/big_map.md | 232 ++++++++++++++++++++-----
 1 file changed, 185 insertions(+), 47 deletions(-)

diff --git a/gitlab-pages/docs/reference/big_map.md b/gitlab-pages/docs/reference/big_map.md
index 952275c1c..9ef541929 100644
--- a/gitlab-pages/docs/reference/big_map.md
+++ b/gitlab-pages/docs/reference/big_map.md
@@ -1,25 +1,36 @@
 ---
 id: big-map-reference
-title: Big Maps — Scalable Maps
+title: Big_map
+description: A lazily deserialized map that's intended to store large amounts of data.
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-Ordinary maps are fine for contracts with a finite lifespan or a
-bounded number of users. For many contracts however, the intention is
-to have a map holding *many* entries, potentially millions of
-them. The cost of loading those entries into the environment each time
-a user executes the contract would eventually become too expensive
-were it not for *big maps*. Big maps are a data structure offered by
-Michelson which handles the scaling concerns for us. In LIGO, the
-interface for big maps is analogous to the one used for ordinary maps.
+A lazily deserialized map that's intended to store large amounts of data.
 
-# Declaring a Map
+The gast costs of deserialized maps are higher than standard maps as data is lazily deserialized.
 
 
+<SyntaxTitle syntax="pascaligo">
+type big_map (key, value)
+</SyntaxTitle>
+
+
+<SyntaxTitle syntax="cameligo">
+type ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type big_map ('key, 'value)
+</SyntaxTitle>
+
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
+The type of a big map from values of type `key` to
+values of type `value` is `big_map (key, value)`.
+
+```pascaligo group=big_map
 type move is int * int
 type register is big_map (address, move)
 ```
@@ -27,57 +38,91 @@ type register is big_map (address, move)
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+The type of a big map from values of type `key` to values
+of type `value` is `(key, value) big_map`.
+
+```cameligo group=big_map
 type move = int * int
 type register = (address, move) big_map
 ```
 
 </Syntax>
 <Syntax syntax="reasonligo">
+The type of a big map from values of type `key` to
+values of type `value` is `big_map (key, value)`.
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 type move = (int, int);
 type register = big_map (address, move);
 ```
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function empty : big_map (key, value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val empty : ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let empty: big_map ('key, 'value)
+</SyntaxTitle>
 
-
-# Creating an Empty Big Map
-
-
+Create an empty big_map.
 
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
+```pascaligo group=big_map
+const empty : register = Big_map.empty
+```
+
+Alternatively, you can also create an empty big_map using:
+
+```pascaligo group=big_map
 const empty : register = big_map []
 ```
 
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+```cameligo group=big_map
 let empty : register = Big_map.empty
 ```
 
 </Syntax>
 <Syntax syntax="reasonligo">
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 let empty : register = Big_map.empty
 ```
 
 </Syntax>
 
 
-# Creating a Non-empty Map
-
+<SyntaxTitle syntax="pascaligo">
+function literal : list (key * value) -> big_map (key, value) 
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val literal : ('key * 'value) list -> ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let literal: list(('key, 'value)) => big_map('key, 'value)
+</SyntaxTitle>
 
+Create a non-empty big_map.
 
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
+```pascaligo group=big_map
+const moves : register =
+  Big_map.literal ([
+    ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2);
+    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)])
+```
+
+Alternative way of creating an empty big_map:
+
+```pascaligo group=big_map
 const moves : register =
   big_map [
     ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2);
@@ -87,7 +132,7 @@ const moves : register =
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+```cameligo group=big_map
 let moves : register =
   Big_map.literal [
     (("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address), (1,2));
@@ -97,7 +142,7 @@ let moves : register =
 </Syntax>
 <Syntax syntax="reasonligo">
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 let moves : register =
   Big_map.literal ([
     ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address, (1,2)),
@@ -106,13 +151,32 @@ let moves : register =
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function find_opt : key -> big_map (key, value) -> option value
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val find_opt : 'key -> ('key, 'value) big_map -> 'value option
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let find_opt : ('key, big_map ('key, 'value)) => option ('value)
+</SyntaxTitle>
 
-# Accessing Values
+Retrieve a value from a big map with the given key. 
+
+Because the key may be missing in the big map, the result is an 
+*optional value*.
 
 
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
+```pascaligo group=big_map
+const my_balance : option (move) =
+  Big_map.find_opt ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address, moves)
+```
+
+Alternatively:
+
+```pascaligo group=big_map
 const my_balance : option (move) =
   moves [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address)]
 ```
@@ -120,7 +184,7 @@ const my_balance : option (move) =
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+```cameligo group=big_map
 let my_balance : move option =
   Big_map.find_opt ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) moves
 ```
@@ -128,33 +192,57 @@ let my_balance : move option =
 </Syntax>
 <Syntax syntax="reasonligo">
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 let my_balance : option (move) =
   Big_map.find_opt ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address, moves);
 ```
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function update : key -> option value -> big_map (key, value) -> big_map (key, value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val update: 'key -> 'value option -> ('key, 'value) big_map -> ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let update: ('key, option('value), big_map ('key, 'value)) => big_map ('key, 'value)
+</SyntaxTitle>
 
-
-# Updating Big Maps
-
+Note: when `None` is used as a value, the value is removed from the big_map.
 
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
-function add (var m : register) : register is
-  block {
-    m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9)
-  } with m
-
-const updated_map : register = add (moves)
+```pascaligo group=big_map
+  Big_map.update(("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), m, (4,9));
 ```
 
+Alternatively:
+
+```pascaligo group=big_map
+  m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9)
+```
+
+If multiple bindings need to be updated, PascaLIGO offers a *patch
+instruction* for maps, similar to that for records.
+
+```pascaligo group=big_map
+function assignments (var m : register) : register is
+  block {
+    patch m with map [
+      ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (4,9);
+      ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2)
+    ]
+  } with m
+```
+
+> Note the use of the keyword `map` instead of `big_map` (which is not
+> a keyword).
+
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+```cameligo group=big_map
 let updated_map : register =
   Big_map.update
     ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) (Some (4,9)) moves
@@ -163,7 +251,7 @@ let updated_map : register =
 </Syntax>
 <Syntax syntax="reasonligo">
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 let updated_map : register =
   Big_map.update
     (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), Some ((4,9)), moves);
@@ -171,14 +259,64 @@ let updated_map : register =
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function add : key -> value -> big_map (key, value) -> big_map (key, value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val add : 'key -> 'value -> ('key, 'value) big_map  -> ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let add: ('key, 'value, big_map('key, 'value)) => big_map('key, 'value) 
+</SyntaxTitle>
+<Syntax syntax="pascaligo">
 
-# Removing Bindings
+```pascaligo group=big_map
+Big_map.add (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4, 9), m)
+```
+
+</Syntax>
+<Syntax syntax="cameligo">
+
+```cameligo group=big_map
+let add (m : register) : register =
+  Big_map.add
+    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) (4,9) m
+```
+
+</Syntax>
+<Syntax syntax="reasonligo">
+
+```reasonligo group=big_map
+let add = (m: register): register =>
+  Big_map.add
+    (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4,9), m);
+```
+
+</Syntax>
 
 
+<SyntaxTitle syntax="pascaligo">
+function remove: key -> big_map (key, value) -> big_map (key, value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val remove: 'key -> ('key, 'value) big_map -> ('key, 'value) big_map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let remove: (key, big_map ('key, 'value)) => big_map ('key, 'value)
+</SyntaxTitle>
 
 <Syntax syntax="pascaligo">
 
-```pascaligo group=big_maps
+```pascaligo group=big_map
+  const_updated_map : register = 
+    Big_map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
+```
+
+Alternatively, the instruction `remove key from map m` removes the key
+`key` from the big map `m` (note that the keyword is `map`, not
+`big_map`).
+
+```pascaligo group=big_map
 function rem (var m : register) : register is
   block {
     remove ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address) from map moves
@@ -190,17 +328,17 @@ const updated_map : register = rem (moves)
 </Syntax>
 <Syntax syntax="cameligo">
 
-```cameligo group=big_maps
+```cameligo group=big_map
 let updated_map : register =
-  Map.remove ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address) moves
+  Big_map.remove ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address) moves
 ```
 
 </Syntax>
 <Syntax syntax="reasonligo">
 
-```reasonligo group=big_maps
+```reasonligo group=big_map
 let updated_map : register =
-  Map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
+  Big_map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
 ```
 
 </Syntax>

From 608a7b7f9513bdc2f47e1febcc4b7b3f016927ca Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Tue, 10 Mar 2020 12:54:18 +0100
Subject: [PATCH 04/43] - Refactor operators.ml to have shared pseudo modules.
 - Fix tests for big_map

---
 gitlab-pages/docs/reference/big_map.md |  31 ++-
 src/passes/operators/operators.ml      | 336 +++++++++++--------------
 2 files changed, 164 insertions(+), 203 deletions(-)

diff --git a/gitlab-pages/docs/reference/big_map.md b/gitlab-pages/docs/reference/big_map.md
index 9ef541929..956752427 100644
--- a/gitlab-pages/docs/reference/big_map.md
+++ b/gitlab-pages/docs/reference/big_map.md
@@ -79,7 +79,7 @@ const empty : register = Big_map.empty
 Alternatively, you can also create an empty big_map using:
 
 ```pascaligo group=big_map
-const empty : register = big_map []
+const empty_alternative : register = big_map []
 ```
 
 </Syntax>
@@ -115,18 +115,18 @@ Create a non-empty big_map.
 
 ```pascaligo group=big_map
 const moves : register =
-  Big_map.literal ([
-    ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2);
-    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)])
+  Big_map.literal (list [
+    (("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address), (1,2));
+    (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (0,3))]);
 ```
 
 Alternative way of creating an empty big_map:
 
 ```pascaligo group=big_map
-const moves : register =
+const moves_alternative : register =
   big_map [
     ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2);
-    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)]
+    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)];
 ```
 
 </Syntax>
@@ -171,14 +171,14 @@ Because the key may be missing in the big map, the result is an
 
 ```pascaligo group=big_map
 const my_balance : option (move) =
-  Big_map.find_opt ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address, moves)
+  Big_map.find_opt (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), moves)
 ```
 
 Alternatively:
 
 ```pascaligo group=big_map
-const my_balance : option (move) =
-  moves [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address)]
+const my_balance_alternative : option (move) =
+  moves [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address)];
 ```
 
 </Syntax>
@@ -214,13 +214,18 @@ Note: when `None` is used as a value, the value is removed from the big_map.
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=big_map
-  Big_map.update(("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), m, (4,9));
+  const updated_big_map : register = Big_map.update(("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), Some (4,9), moves);
 ```
 
 Alternatively:
 
 ```pascaligo group=big_map
-  m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9)
+
+function update (var m : register) : register is
+  block {
+    m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9);
+  } with m
+  
 ```
 
 If multiple bindings need to be updated, PascaLIGO offers a *patch
@@ -271,7 +276,7 @@ let add: ('key, 'value, big_map('key, 'value)) => big_map('key, 'value)
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=big_map
-Big_map.add (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4, 9), m)
+const added_item : register = Big_map.add (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4, 9), moves)
 ```
 
 </Syntax>
@@ -308,7 +313,7 @@ let remove: (key, big_map ('key, 'value)) => big_map ('key, 'value)
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=big_map
-  const_updated_map : register = 
+  const updated_map : register = 
     Big_map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
 ```
 
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index e2adcc18f..2a8c5afb9 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -62,42 +62,126 @@ module Simplify = struct
     | "contract"  -> ok @@ TC_contract unit_expr
     | _           -> simple_fail @@ "Not a built-in type (" ^ s ^ ")."
 
+  let pseudo_modules = function
+    | "Tezos.chain_id"         -> ok C_CHAIN_ID
+    | "Tezos.balance"          -> ok C_BALANCE
+    | "Tezos.now"              -> ok C_NOW
+    | "Tezos.amount"           -> ok C_AMOUNT
+    | "Tezos.sender"           -> ok C_SENDER
+    | "Tezos.address"          -> ok C_ADDRESS
+    | "Tezos.self"             -> ok C_SELF
+    | "Tezos.self_address"     -> ok C_SELF_ADDRESS
+    | "Tezos.implicit_account" -> ok C_IMPLICIT_ACCOUNT
+    | "Tezos.source"           -> ok C_SOURCE
+    | "Tezos.failwith"         -> ok C_FAILWITH
+    | "Tezos.create_contract"  -> ok C_CREATE_CONTRACT
+    | "Tezos.transaction"      -> ok C_CALL
+    | "Tezos.set_delegate"     -> ok C_SET_DELEGATE
+    | "Tezos.get_contract_opt" -> ok C_CONTRACT_OPT
+    | "Tezos.get_entrypoint_opt" -> ok C_CONTRACT_ENTRYPOINT_OPT
+
+    (* Crypto module *)
+
+    | "Crypto.check"    -> ok C_CHECK_SIGNATURE
+    | "Crypto.hash_key" -> ok C_HASH_KEY    
+    | "Crypto.blake2b"  -> ok C_BLAKE2b
+    | "Crypto.sha256"   -> ok C_SHA256    
+    | "Crypto.sha512"   -> ok C_SHA512
+    
+    (* Bytes module *)
+
+    | "Bytes.pack"   -> ok C_BYTES_PACK    
+    | "Bytes.unpack" -> ok C_BYTES_UNPACK
+    | "Bytes.length" -> ok C_SIZE    
+    | "Bytes.concat" -> ok C_CONCAT
+    | "Bytes.sub"    -> ok C_SLICE
+
+    (* List module *)   
+
+    | "List.length" -> ok C_SIZE
+    | "List.size"   -> ok C_SIZE
+    | "List.iter"   -> ok C_LIST_ITER
+    | "List.map"    -> ok C_LIST_MAP
+    | "List.fold"   -> ok C_LIST_FOLD
+
+    (* Set module *)   
+
+    | "Set.empty"    -> ok C_SET_EMPTY
+    | "Set.literal"  -> ok C_SET_LITERAL
+    | "Set.cardinal" -> ok C_SIZE
+    | "Set.mem"     -> ok C_SET_MEM
+    | "Set.add"     -> ok C_SET_ADD
+    | "Set.remove"  -> ok C_SET_REMOVE
+    | "Set.iter"    -> ok C_SET_ITER
+    | "Set.fold"    -> ok C_SET_FOLD
+
+    (* Map module *)   
+
+    | "Map.find_opt" -> ok C_MAP_FIND_OPT
+    | "Map.update"   -> ok C_MAP_UPDATE
+    | "Map.iter"     -> ok C_MAP_ITER
+    | "Map.map"      -> ok C_MAP_MAP
+    | "Map.fold"     -> ok C_MAP_FOLD
+    | "Map.mem"      -> ok C_MAP_MEM
+    | "Map.size"     -> ok C_SIZE
+    | "Map.add"      -> ok C_MAP_ADD
+    | "Map.remove"   -> ok C_MAP_REMOVE
+    | "Map.empty"    -> ok C_MAP_EMPTY
+    | "Map.literal"  -> ok C_MAP_LITERAL
+    
+    (* Big_map module *)   
+    
+    | "Big_map.find"     -> ok C_MAP_FIND
+    | "Big_map.find_opt" -> ok C_MAP_FIND_OPT
+    | "Big_map.update"   -> ok C_MAP_UPDATE
+    | "Big_map.literal"  -> ok C_BIG_MAP_LITERAL
+    | "Big_map.empty"    -> ok C_BIG_MAP_EMPTY
+    | "Big_map.size"     -> ok C_SIZE
+    | "Big_map.mem"      -> ok C_MAP_MEM
+    | "Big_map.iter"     -> ok C_MAP_ITER
+    | "Big_map.map"      -> ok C_MAP_MAP
+    | "Big_map.fold"     -> ok C_MAP_FOLD
+    | "Big_map.remove"   -> ok C_MAP_REMOVE
+    | "Big_map.add"      -> ok C_MAP_ADD
+
+    (* Bitwise module *)
+
+    | "Bitwise.or"          -> ok C_OR
+    | "Bitwise.and"         -> ok C_AND
+    | "Bitwise.xor"         -> ok C_XOR
+    | "Bitwise.shift_left"  -> ok C_LSL
+    | "Bitwise.shift_right" -> ok C_LSR
+
+    (* String module *)
+
+    | "String.length"   -> ok C_SIZE
+    | "String.size"     -> ok C_SIZE
+    | "String.slice"    -> ok C_SLICE
+    | "String.sub"      -> ok C_SLICE
+    | "String.concat"   -> ok C_CONCAT
+
+    | _ -> simple_fail "Not a built-in"
+
 
   module Pascaligo = struct
     let constants = function
     (* Tezos module (ex-Michelson) *)
-    | "Tezos.chain_id"         -> ok C_CHAIN_ID
     | "chain_id"               -> ok C_CHAIN_ID            (* Deprecated *)
-    | "get_chain_id"           -> ok C_CHAIN_ID            (* Deprecated *)
-    | "Tezos.balance"          -> ok C_BALANCE
-    | "balance"                -> ok C_BALANCE             (* Deprecated *)
-    | "Tezos.now"              -> ok C_NOW
+    | "get_chain_id"           -> ok C_CHAIN_ID            (* Deprecated *)    
+    | "balance"                -> ok C_BALANCE             (* Deprecated *)    
     | "now"                    -> ok C_NOW                 (* Deprecated *)
-    | "Tezos.amount"           -> ok C_AMOUNT
     | "amount"                 -> ok C_AMOUNT              (* Deprecated *)
-    | "Tezos.sender"           -> ok C_SENDER
     | "sender"                 -> ok C_SENDER              (* Deprecated *)
-    | "Tezos.address"          -> ok C_ADDRESS
-    | "address"                    -> ok C_ADDRESS             (* Deprecated *)
-    | "Tezos.self"             -> ok C_SELF
-    | "Tezos.self_address"     -> ok C_SELF_ADDRESS
+    | "address"                    -> ok C_ADDRESS             (* Deprecated *)    
     | "self_address"           -> ok C_SELF_ADDRESS        (* Deprecated *)
-    | "Tezos.implicit_account" -> ok C_IMPLICIT_ACCOUNT
-    | "implicit_account"       -> ok C_IMPLICIT_ACCOUNT    (* Deprecated *)
-    | "Tezos.source"           -> ok C_SOURCE
-    | "source"                 -> ok C_SOURCE              (* Deprecated *)
-    | "Tezos.failwith"         -> ok C_FAILWITH
+    | "implicit_account"       -> ok C_IMPLICIT_ACCOUNT    (* Deprecated *)    
+    | "source"                 -> ok C_SOURCE              (* Deprecated *)    
     | "failwith"               -> ok C_FAILWITH
-    | "Tezos.create_contract"  -> ok C_CREATE_CONTRACT
-    | "Tezos.transaction"      -> ok C_CALL
     | "transaction"            -> ok C_CALL                    (* Deprecated *)
-    | "Tezos.set_delegate"     -> ok C_SET_DELEGATE
     | "set_delegate"           -> ok C_SET_DELEGATE            (* Deprecated *)
     | "get_contract"           -> ok C_CONTRACT                (* Deprecated *)
-    | "Tezos.get_contract_opt" -> ok C_CONTRACT_OPT
     | "get_contract_opt"       -> ok C_CONTRACT_OPT            (* Deprecated *)
     | "get_entrypoint"         -> ok C_CONTRACT_ENTRYPOINT     (* Deprecated *)
-    | "Tezos.get_entrypoint_opt" -> ok C_CONTRACT_ENTRYPOINT_OPT
     | "get_entrypoint_opt"     -> ok C_CONTRACT_ENTRYPOINT_OPT (* Deprecated *)
 
     | "Michelson.is_nat" -> ok C_IS_NAT  (* Deprecated *)
@@ -126,113 +210,64 @@ module Simplify = struct
 
     (* Crypto module *)
 
-    | "Crypto.check"    -> ok C_CHECK_SIGNATURE
     | "crypto_check"    -> ok C_CHECK_SIGNATURE       (* Deprecated *)
-    | "Crypto.hash_key" -> ok C_HASH_KEY
-    | "crypto_hash_key" -> ok C_HASH_KEY              (* Deprecated *)
-    | "Crypto.blake2b"  -> ok C_BLAKE2b
-    | "blake2b"         -> ok C_BLAKE2b               (* Deprecated *)
-    | "Crypto.sha256"   -> ok C_SHA256
-    | "sha_256"         -> ok C_SHA256                (* Deprecated *)
-    | "Crypto.sha512"   -> ok C_SHA512
+    | "crypto_hash_key" -> ok C_HASH_KEY              (* Deprecated *)    
+    | "blake2b"         -> ok C_BLAKE2b               (* Deprecated *)    
+    | "sha_256"         -> ok C_SHA256                (* Deprecated *)       
     | "sha_512"         -> ok C_SHA512                (* Deprecated *)
 
     (* Bytes module *)
 
-    | "Bytes.pack"   -> ok C_BYTES_PACK
-    | "bytes_pack"   -> ok C_BYTES_PACK    (* Deprecated *)
-    | "Bytes.unpack" -> ok C_BYTES_UNPACK
-    | "bytes_unpack" -> ok C_BYTES_UNPACK  (* Deprecated *)
-    | "Bytes.length" -> ok C_SIZE
+    | "bytes_pack"   -> ok C_BYTES_PACK    (* Deprecated *)    
+    | "bytes_unpack" -> ok C_BYTES_UNPACK  (* Deprecated *)    
     | "Bytes.size"   -> ok C_SIZE          (* Deprecated *)
-    | "bytes_concat" -> ok C_CONCAT        (* Deprecated *)
-    | "Bytes.concat" -> ok C_CONCAT
-    | "Bytes.slice"  -> ok C_SLICE
+    | "bytes_concat" -> ok C_CONCAT        (* Deprecated *)    
     | "bytes_slice"  -> ok C_SLICE         (* Deprecated *)
-    | "Bytes.sub"    -> ok C_SLICE
+    | "Bytes.slice"  -> ok C_SLICE         (* Deprecated *)
 
     (* List module *)
 
-    | "List.length" -> ok C_SIZE
-    | "List.size"   -> ok C_SIZE
     | "list_size"   -> ok C_SIZE       (* Deprecated *)
-    | "List.iter"   -> ok C_LIST_ITER
-    | "list_iter"   -> ok C_LIST_ITER  (* Deprecated *)
-    | "List.map"    -> ok C_LIST_MAP
-    | "list_map"    -> ok C_LIST_MAP   (* Deprecated *)
-    | "List.fold"   -> ok C_LIST_FOLD
+    | "list_iter"   -> ok C_LIST_ITER  (* Deprecated *)    
+    | "list_map"    -> ok C_LIST_MAP   (* Deprecated *)    
     | "list_fold"   -> ok C_LIST_FOLD  (* Deprecated *)
 
     (* Set module *)
 
-    | "Set.cardinal" -> ok C_SIZE
+    
     | "Set.size"    -> ok C_SIZE        (* Deprecated *)
     | "set_size"    -> ok C_SIZE        (* Deprecated *)
-    | "set_empty"   -> ok C_SET_EMPTY   (* Deprecated *)
-    | "Set.mem"     -> ok C_SET_MEM
-    | "set_mem"     -> ok C_SET_MEM     (* Deprecated *)
-    | "Set.add"     -> ok C_SET_ADD
-    | "set_add"     -> ok C_SET_ADD     (* Deprecated *)
-    | "Set.remove"  -> ok C_SET_REMOVE
-    | "set_remove"  -> ok C_SET_REMOVE  (* Deprecated *)
-    | "Set.iter"    -> ok C_SET_ITER
-    | "set_iter"    -> ok C_SET_ITER    (* Deprecated *)
-    | "Set.fold"    -> ok C_SET_FOLD
+    | "set_empty"   -> ok C_SET_EMPTY   (* Deprecated *)    
+    | "set_mem"     -> ok C_SET_MEM     (* Deprecated *)    
+    | "set_add"     -> ok C_SET_ADD     (* Deprecated *)    
+    | "set_remove"  -> ok C_SET_REMOVE  (* Deprecated *)    
+    | "set_iter"    -> ok C_SET_ITER    (* Deprecated *)    
     | "set_fold"    -> ok C_SET_FOLD    (* Deprecated *)
 
     (* Map module *)
 
     | "get_force"    -> ok C_MAP_FIND      (* Deprecated *)
-    | "map_get"      -> ok C_MAP_FIND_OPT  (* Deprecated *)
-    | "Map.find_opt" -> ok C_MAP_FIND_OPT
-    | "Map.update"   -> ok C_MAP_UPDATE
+    | "map_get"      -> ok C_MAP_FIND_OPT  (* Deprecated *)    
     | "map_update"   -> ok C_MAP_UPDATE    (* Deprecated *)
-    | "map_remove"   -> ok C_MAP_REMOVE    (* Deprecated *)
-    | "Map.iter"     -> ok C_MAP_ITER
-    | "map_iter"     -> ok C_MAP_ITER      (* Deprecated *)
-    | "Map.map"      -> ok C_MAP_MAP
-    | "map_map"      -> ok C_MAP_MAP       (* Deprecated *)
-    | "Map.fold"     -> ok C_MAP_FOLD
-    | "map_fold"     -> ok C_MAP_FOLD      (* Deprecated *)
-    | "Map.mem"      -> ok C_MAP_MEM
-    | "map_mem"      -> ok C_MAP_MEM       (* Deprecated *)
-    | "Map.size"     -> ok C_SIZE
+    | "map_remove"   -> ok C_MAP_REMOVE    (* Deprecated *)    
+    | "map_iter"     -> ok C_MAP_ITER      (* Deprecated *)    
+    | "map_map"      -> ok C_MAP_MAP       (* Deprecated *)    
+    | "map_fold"     -> ok C_MAP_FOLD      (* Deprecated *)    
+    | "map_mem"      -> ok C_MAP_MEM       (* Deprecated *)    
     | "map_size"     -> ok C_SIZE          (* Deprecated *)
 
-    (* Big_map module *)
-
-    | "Big_map.find_opt" -> ok C_MAP_FIND_OPT
-    | "Big_map.update"   -> ok C_MAP_UPDATE
-    | "Big_map.literal"  -> ok C_BIG_MAP_LITERAL
-    | "Big_map.empty"    -> ok C_BIG_MAP_EMPTY
-    | "Big_map.size"     -> ok C_SIZE
-    | "Big_map.mem"      -> ok C_MAP_MEM
-    | "Big_map.iter"     -> ok C_MAP_ITER
-    | "Big_map.map"      -> ok C_MAP_MAP
-    | "Big_map.fold"     -> ok C_MAP_FOLD
-    | "Big_map.remove"   -> ok C_MAP_REMOVE
 
     (* Bitwise module *)
 
-    | "Bitwise.or"          -> ok C_OR
-    | "bitwise_or"          -> ok C_OR      (* Deprecated *)
-    | "Bitwise.and"         -> ok C_AND
-    | "bitwise_and"         -> ok C_AND     (* Deprecated *)
-    | "Bitwise.xor"         -> ok C_XOR
-    | "bitwise_xor"         -> ok C_XOR     (* Deprecated *)
-    | "Bitwise.shift_left"  -> ok C_LSL
-    | "bitwise_lsl"         -> ok C_LSL     (* Deprecated *)
-    | "Bitwise.shift_right" -> ok C_LSR
+    | "bitwise_or"          -> ok C_OR      (* Deprecated *)    
+    | "bitwise_and"         -> ok C_AND     (* Deprecated *)    
+    | "bitwise_xor"         -> ok C_XOR     (* Deprecated *)    
+    | "bitwise_lsl"         -> ok C_LSL     (* Deprecated *)    
     | "bitwise_lsr"         -> ok C_LSR     (* Deprecated *)
 
     (* String module *)
-
-    | "String.length"   -> ok C_SIZE
-    | "String.size"     -> ok C_SIZE
-    | "String.slice"    -> ok C_SLICE
+    
     | "string_slice"    -> ok C_SLICE    (* Deprecated *)
-    | "String.sub"      -> ok C_SLICE
-    | "String.concat"   -> ok C_CONCAT
     | "string_concat"   -> ok C_CONCAT   (* Deprecated *)
 
     (* Others *)
@@ -240,56 +275,41 @@ module Simplify = struct
     | "assert"          -> ok C_ASSERTION
     | "size"            -> ok C_SIZE (* Deprecated *)
 
-    | _                 -> simple_fail "Not a PascaLIGO built-in."
+    | _ as c            -> 
+      pseudo_modules c
 
     let type_constants = type_constants
     let type_operators = type_operators
   end
 
-
   module Cameligo = struct
     let constants = function
     (* Tezos (ex-Michelson, ex-Current, ex-Operation) *)
 
-    | "Tezos.chain_id"             -> ok C_CHAIN_ID
-    | "chain_id"                   -> ok C_CHAIN_ID            (* Deprecated *)
-    | "Tezos.balance"              -> ok C_BALANCE
+    | "chain_id"                   -> ok C_CHAIN_ID            (* Deprecated *)    
     | "Current.balance"            -> ok C_BALANCE             (* Deprecated *)
-    | "balance"                    -> ok C_BALANCE             (* Deprecated *)
-    | "Tezos.now"                  -> ok C_NOW
+    | "balance"                    -> ok C_BALANCE             (* Deprecated *)    
     | "Current.time"               -> ok C_NOW                 (* Deprecated *)
-    | "time"                       -> ok C_NOW                 (* Deprecated *)
-    | "Tezos.amount"               -> ok C_AMOUNT
+    | "time"                       -> ok C_NOW                 (* Deprecated *)    
     | "Current.amount"             -> ok C_AMOUNT              (* Deprecated *)
-    | "amount"                     -> ok C_AMOUNT              (* Deprecated *)
-    | "Tezos.sender"               -> ok C_SENDER
+    | "amount"                     -> ok C_AMOUNT              (* Deprecated *)    
     | "Current.sender"             -> ok C_SENDER              (* Deprecated *)
-    | "sender"                     -> ok C_SENDER              (* Deprecated *)
-    | "Tezos.address"              -> ok C_ADDRESS
-    | "Current.address"            -> ok C_ADDRESS             (* Deprecated *)
-    | "Tezos.self"                 -> ok C_SELF
-    | "Tezos.self_address"         -> ok C_SELF_ADDRESS
-    | "Current.self_address"       -> ok C_SELF_ADDRESS        (* Deprecated *)
-    | "Tezos.implicit_account"     -> ok C_IMPLICIT_ACCOUNT
-    | "Current.implicit_account"   -> ok C_IMPLICIT_ACCOUNT    (* Deprecated *)
-    | "Tezos.source"               -> ok C_SOURCE
+    | "sender"                     -> ok C_SENDER              (* Deprecated *)    
+    | "Current.address"            -> ok C_ADDRESS             (* Deprecated *)    
+    | "Current.self_address"       -> ok C_SELF_ADDRESS        (* Deprecated *)    
+    | "Current.implicit_account"   -> ok C_IMPLICIT_ACCOUNT    (* Deprecated *)    
     | "Current.source"             -> ok C_SOURCE              (* Deprecated *)
-    | "source"                     -> ok C_SOURCE              (* Deprecated *)
-    | "Tezos.failwith"             -> ok C_FAILWITH
+    | "source"                     -> ok C_SOURCE              (* Deprecated *)    
     | "Current.failwith"           -> ok C_FAILWITH            (* Deprecated *)
     | "failwith"                   -> ok C_FAILWITH
-
-    | "Tezos.transaction"            -> ok C_CALL
+    
     | "Operation.transaction"        -> ok C_CALL              (* Deprecated *)
     | "Tezos.set_delegate"           -> ok C_SET_DELEGATE      (* Deprecated *)
     | "Operation.set_delegate"       -> ok C_SET_DELEGATE      (* Deprecated *)
     | "Operation.get_contract"       -> ok C_CONTRACT          (* Deprecated *)
-    | "Tezos.get_contract_opt"       -> ok C_CONTRACT_OPT
     | "Operation.get_contract_opt"   -> ok C_CONTRACT_OPT      (* Deprecated *)
     | "Operation.get_entrypoint"   -> ok C_CONTRACT_ENTRYPOINT (* Deprecated *)
-    | "Tezos.get_entrypoint_opt"     -> ok C_CONTRACT_ENTRYPOINT_OPT
     | "Operation.get_entrypoint_opt" -> ok C_CONTRACT_ENTRYPOINT_OPT (* Deprecated *)
-    | "Tezos.create_contract"        -> ok C_CREATE_CONTRACT
 
     | "Michelson.is_nat" -> ok C_IS_NAT  (* Deprecated *)
     | "is_nat"           -> ok C_IS_NAT
@@ -314,87 +334,22 @@ module Simplify = struct
     | "CONS"             -> ok C_CONS
     | "NEQ"              -> ok C_NEQ
 
-    (* Crypto module *)
-
-    | "Crypto.check"    -> ok C_CHECK_SIGNATURE
-    | "Crypto.hash_key" -> ok C_HASH_KEY
-    | "Crypto.blake2b"  -> ok C_BLAKE2b
-    | "Crypto.sha256"   -> ok C_SHA256
-    | "Crypto.sha512"   -> ok C_SHA512
-
     (* Bytes module *)
 
-    | "Bytes.pack"   -> ok C_BYTES_PACK
-    | "Bytes.unpack" -> ok C_BYTES_UNPACK
-    | "Bytes.length" -> ok C_SIZE
     | "Bytes.size"   -> ok C_SIZE       (* Deprecated *)
-    | "Bytes.concat" -> ok C_CONCAT
     | "Bytes.slice"  -> ok C_SLICE      (* Deprecated *)
-    | "Bytes.sub"    -> ok C_SLICE
 
-    (* List module *)
-
-    | "List.length" -> ok C_SIZE
-    | "List.size"   -> ok C_SIZE
-    | "List.iter"   -> ok C_LIST_ITER
-    | "List.map"    -> ok C_LIST_MAP
-    | "List.fold"   -> ok C_LIST_FOLD
-
-    (* Set module *)
-
-    | "Set.mem"      -> ok C_SET_MEM
-    | "Set.iter"     -> ok C_SET_ITER
-    | "Set.empty"    -> ok C_SET_EMPTY
-    | "Set.literal"  -> ok C_SET_LITERAL
-    | "Set.add"      -> ok C_SET_ADD
-    | "Set.remove"   -> ok C_SET_REMOVE
-    | "Set.fold"     -> ok C_SET_FOLD
+    (* Set module *)   
     | "Set.size"     -> ok C_SIZE (* Deprecated *)
-    | "Set.cardinal" -> ok C_SIZE
 
     (* Map module *)
-
-    | "Map.find_opt" -> ok C_MAP_FIND_OPT
     | "Map.find"     -> ok C_MAP_FIND     (* Deprecated *)
-    | "Map.update"   -> ok C_MAP_UPDATE
-    | "Map.add"      -> ok C_MAP_ADD
-    | "Map.remove"   -> ok C_MAP_REMOVE
-    | "Map.iter"     -> ok C_MAP_ITER
-    | "Map.map"      -> ok C_MAP_MAP
-    | "Map.fold"     -> ok C_MAP_FOLD
-    | "Map.mem"      -> ok C_MAP_MEM
-    | "Map.empty"    -> ok C_MAP_EMPTY
-    | "Map.literal"  -> ok C_MAP_LITERAL
-    | "Map.size"     -> ok C_SIZE
-
-    (* Big_map module *)
-
-    | "Big_map.find_opt" -> ok C_MAP_FIND_OPT
-    | "Big_map.find"     -> ok C_MAP_FIND
-    | "Big_map.update"   -> ok C_MAP_UPDATE
-    | "Big_map.add"      -> ok C_MAP_ADD
-    | "Big_map.remove"   -> ok C_MAP_REMOVE
-    | "Big_map.literal"  -> ok C_BIG_MAP_LITERAL
-    | "Big_map.empty"    -> ok C_BIG_MAP_EMPTY
 
     (* Bitwise module *)
 
-    | "Bitwise.or"          -> ok C_OR
     | "Bitwise.lor"         -> ok C_OR  (* Deprecated *)
-    | "Bitwise.and"         -> ok C_AND
     | "Bitwise.land"        -> ok C_AND (* Deprecated *)
-    | "Bitwise.xor"         -> ok C_XOR
     | "Bitwise.lxor"        -> ok C_XOR (* Deprecated *)
-    | "Bitwise.shift_left"  -> ok C_LSL
-    | "Bitwise.shift_right" -> ok C_LSR
-
-    (* String module *)
-
-    | "String.length" -> ok C_SIZE
-    | "String.size"   -> ok C_SIZE
-    | "String.slice"  -> ok C_SLICE
-    | "String.sub"    -> ok C_SLICE
-    | "String.concat" -> ok C_CONCAT
 
     (* Loop module *)
 
@@ -408,7 +363,8 @@ module Simplify = struct
 
     | "assert" -> ok C_ASSERTION
 
-    | _ -> simple_fail "Not a CameLIGO built-in."
+    | _ as c -> 
+      pseudo_modules c
 
     let type_constants = type_constants
     let type_operators = type_operators

From 978c95fa76c21b9954cc3127e23576540cbadbcb Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Tue, 10 Mar 2020 13:50:36 +0100
Subject: [PATCH 05/43] Remove versions.json from docker compose file.

---
 gitlab-pages/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitlab-pages/docker-compose.yml b/gitlab-pages/docker-compose.yml
index af12b7af7..8f9e490b8 100644
--- a/gitlab-pages/docker-compose.yml
+++ b/gitlab-pages/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       # - ./website/versioned_docs:/app/website/versioned_docs
       - ./website/sidebars.json:/app/website/sidebars.json
       - ./website/docusaurus.config.js:/app/website/docusaurus.config.js
-      - ./website/versions.json:/app/website/versions.json
+      # - ./website/versions.json:/app/website/versions.json
       # - ./website/core/AlgoliaSearch.js:/app/website/core/AlgoliaSearch.js
       
     working_dir: /app/website

From 31e8035e6aa7d13b8fd1a9eae9dbad91bcae9228 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Tue, 10 Mar 2020 14:52:59 +0100
Subject: [PATCH 06/43] Remove incorrect Big_map operations.

---
 src/passes/operators/operators.ml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index 2a8c5afb9..f01b5aa44 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -136,11 +136,7 @@ module Simplify = struct
     | "Big_map.update"   -> ok C_MAP_UPDATE
     | "Big_map.literal"  -> ok C_BIG_MAP_LITERAL
     | "Big_map.empty"    -> ok C_BIG_MAP_EMPTY
-    | "Big_map.size"     -> ok C_SIZE
     | "Big_map.mem"      -> ok C_MAP_MEM
-    | "Big_map.iter"     -> ok C_MAP_ITER
-    | "Big_map.map"      -> ok C_MAP_MAP
-    | "Big_map.fold"     -> ok C_MAP_FOLD
     | "Big_map.remove"   -> ok C_MAP_REMOVE
     | "Big_map.add"      -> ok C_MAP_ADD
 

From 1597d1eaf44c9df91f0d466e36c415c50cc61292 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Wed, 19 Feb 2020 11:51:49 +0100
Subject: [PATCH 07/43] WIP: recursion

---
 src/test/contracts/recursion.ligo  |  4 ++++
 src/test/contracts/recursion.mligo |  5 +++++
 src/test/integration_tests.ml      | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 src/test/contracts/recursion.ligo
 create mode 100644 src/test/contracts/recursion.mligo

diff --git a/src/test/contracts/recursion.ligo b/src/test/contracts/recursion.ligo
new file mode 100644
index 000000000..839ba45ef
--- /dev/null
+++ b/src/test/contracts/recursion.ligo
@@ -0,0 +1,4 @@
+// Test while loops in PascaLIGO
+
+function fibo (const n : int; const acc: int) : int is
+  if n<1 then acc else fibo(n-1,acc+n)
diff --git a/src/test/contracts/recursion.mligo b/src/test/contracts/recursion.mligo
new file mode 100644
index 000000000..f072f00b6
--- /dev/null
+++ b/src/test/contracts/recursion.mligo
@@ -0,0 +1,5 @@
+// Test while loops in PascaLIGO
+
+let fibo (n : int) (acc: int) : int =
+    if (n < 1) then acc
+    else fibo (n-1) (acc+n)
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 91969b374..bf24a6012 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -1493,6 +1493,20 @@ let assert_religo () : unit result =
   let%bind _ = expect_eq program "main" (make_input true) make_expected in
   ok ()
 
+let recursion_ligo () : unit result =
+  let%bind program = type_file "./contracts/recursion.ligo" in
+  let make_input = e_pair (e_int 10) (e_int 0) in
+  let make_expected = e_int 55 in
+  let%bind _ = expect_eq program "fibo" make_input make_expected in
+  ok ()
+
+let recursion_mligo () : unit result =
+  let%bind program = mtype_file "./contracts/recursion.mligo" in
+  let make_input = e_pair (e_int 10) (e_int 0) in
+  let make_expected = e_int 55 in
+  let%bind _ = expect_eq program "fibo" make_input make_expected in
+  ok ()
+
 let guess_string_mligo () : unit result =
   let%bind program = type_file "./contracts/guess_string.mligo" in
   let make_input = fun n -> e_pair (e_int n) (e_int 42) in
@@ -2407,6 +2421,8 @@ let main = test_suite "Integration (End to End)" [
     test "failwith ligo" failwith_ligo ;
     test "failwith mligo" failwith_mligo ;
     test "assert mligo" assert_mligo ;
+    test "recursion (ligo)" recursion_ligo ;
+    test "recursion (mligo)" recursion_mligo ;
     (* test "guess string mligo" guess_string_mligo ; WIP? *)
     test "lambda mligo" lambda_mligo ;
     test "lambda religo" lambda_religo ;

From b438f065b5d811604c4f8e9a83b9751cf3de1cec Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Thu, 20 Feb 2020 22:31:47 +0100
Subject: [PATCH 08/43] WIP:adding rec keyword

---
 src/passes/1-parser/cameligo/AST.ml         |  2 +
 src/passes/1-parser/cameligo/LexToken.mli   |  1 +
 src/passes/1-parser/cameligo/LexToken.mll   |  3 +
 src/passes/1-parser/cameligo/ParToken.mly   |  1 +
 src/passes/1-parser/cameligo/Parser.mly     | 13 ++--
 src/passes/1-parser/cameligo/ParserLog.ml   |  3 +-
 src/passes/1-parser/pascaligo/AST.ml        |  3 +
 src/passes/1-parser/pascaligo/LexToken.mli  |  1 +
 src/passes/1-parser/pascaligo/LexToken.mll  |  3 +
 src/passes/1-parser/pascaligo/ParToken.mly  |  1 +
 src/passes/1-parser/pascaligo/Parser.mly    | 67 +++++++++++----------
 src/passes/1-parser/pascaligo/ParserLog.ml  |  3 +-
 src/passes/1-parser/reasonligo/LexToken.mli |  1 +
 src/passes/1-parser/reasonligo/LexToken.mll |  3 +
 src/passes/1-parser/reasonligo/ParToken.mly |  1 +
 src/passes/1-parser/reasonligo/Parser.mly   | 13 ++--
 src/passes/2-simplify/cameligo.ml           |  1 +
 src/test/contracts/recursion.ligo           |  2 +-
 src/test/contracts/recursion.mligo          |  2 +-
 19 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/src/passes/1-parser/cameligo/AST.ml b/src/passes/1-parser/cameligo/AST.ml
index 84aebb96e..969284b42 100644
--- a/src/passes/1-parser/cameligo/AST.ml
+++ b/src/passes/1-parser/cameligo/AST.ml
@@ -30,6 +30,7 @@ type kwd_else  = Region.t
 type kwd_end   = Region.t
 type kwd_false = Region.t
 type kwd_fun   = Region.t
+type kwd_rec   = Region.t
 type kwd_if    = Region.t
 type kwd_in    = Region.t
 type kwd_let   = Region.t
@@ -362,6 +363,7 @@ and 'a case_clause = {
 
 and let_in = {
   kwd_let    : kwd_let;
+  kwd_rec    : kwd_rec option;
   binding    : let_binding;
   kwd_in     : kwd_in;
   body       : expr;
diff --git a/src/passes/1-parser/cameligo/LexToken.mli b/src/passes/1-parser/cameligo/LexToken.mli
index 3e3460bc2..26cd6416a 100644
--- a/src/passes/1-parser/cameligo/LexToken.mli
+++ b/src/passes/1-parser/cameligo/LexToken.mli
@@ -95,6 +95,7 @@ type t =
 | End   of Region.t
 | False of Region.t
 | Fun   of Region.t
+| Rec   of Region.t
 | If    of Region.t
 | In    of Region.t
 | Let   of Region.t
diff --git a/src/passes/1-parser/cameligo/LexToken.mll b/src/passes/1-parser/cameligo/LexToken.mll
index f17ea903a..360425c10 100644
--- a/src/passes/1-parser/cameligo/LexToken.mll
+++ b/src/passes/1-parser/cameligo/LexToken.mll
@@ -79,6 +79,7 @@ type t =
 | End   of Region.t
 | False of Region.t
 | Fun   of Region.t
+| Rec   of Region.t
 | If    of Region.t
 | In    of Region.t
 | Let   of Region.t
@@ -154,6 +155,7 @@ let proj_token = function
 | End region -> region, "End"
 | False region -> region, "False"
 | Fun region -> region, "Fun"
+| Rec region -> region, "Rec"
 | If region -> region, "If"
 | In region -> region, "In"
 | Let region -> region, "Let"
@@ -213,6 +215,7 @@ let to_lexeme = function
 | End _   -> "end"
 | False _ -> "false"
 | Fun _   -> "fun"
+| Rec _   -> "rec"
 | If _    -> "if"
 | In _    -> "in"
 | Let _   -> "let"
diff --git a/src/passes/1-parser/cameligo/ParToken.mly b/src/passes/1-parser/cameligo/ParToken.mly
index 8319d166e..0d32e61de 100644
--- a/src/passes/1-parser/cameligo/ParToken.mly
+++ b/src/passes/1-parser/cameligo/ParToken.mly
@@ -59,6 +59,7 @@
 %token <Region.t> End   "end"
 %token <Region.t> False "false"
 %token <Region.t> Fun   "fun"
+%token <Region.t> Rec   "rec"
 %token <Region.t> If    "if"
 %token <Region.t> In    "in"
 %token <Region.t> Let   "let"
diff --git a/src/passes/1-parser/cameligo/Parser.mly b/src/passes/1-parser/cameligo/Parser.mly
index c8c0470a8..b09ea9d38 100644
--- a/src/passes/1-parser/cameligo/Parser.mly
+++ b/src/passes/1-parser/cameligo/Parser.mly
@@ -453,15 +453,16 @@ case_clause(right_expr):
     {pattern=$1; arrow=$2; rhs=$3} }
 
 let_expr(right_expr):
-  "let" let_binding seq(Attr) "in" right_expr  {
+  "let" ioption("rec") let_binding seq(Attr) "in" right_expr  {
     let kwd_let    = $1
-    and binding    = $2
-    and attributes = $3
-    and kwd_in     = $4
-    and body       = $5 in
+    and kwd_rec    = $2
+    and binding    = $3
+    and attributes = $4
+    and kwd_in     = $5
+    and body       = $6 in
     let stop       = expr_to_region body in
     let region     = cover kwd_let stop
-    and value      = {kwd_let; binding; kwd_in; body; attributes}
+    and value      = {kwd_let; kwd_rec; binding; kwd_in; body; attributes}
     in ELetIn {region; value} }
 
 fun_expr(right_expr):
diff --git a/src/passes/1-parser/cameligo/ParserLog.ml b/src/passes/1-parser/cameligo/ParserLog.ml
index aa847e245..36077cffc 100644
--- a/src/passes/1-parser/cameligo/ParserLog.ml
+++ b/src/passes/1-parser/cameligo/ParserLog.ml
@@ -544,8 +544,9 @@ and print_case_clause state {value; _} =
   print_expr    state rhs
 
 and print_let_in state {value; _} =
-  let {kwd_let; binding; kwd_in; body; attributes} = value in
+  let {kwd_let; kwd_rec; binding; kwd_in; body; attributes} = value in
   print_token       state kwd_let "let";
+  print_token_opt   state kwd_rec "rec";
   print_let_binding state binding;
   print_attributes  state attributes;
   print_token       state kwd_in "in";
diff --git a/src/passes/1-parser/pascaligo/AST.ml b/src/passes/1-parser/pascaligo/AST.ml
index 3591cb94b..b78eefd02 100644
--- a/src/passes/1-parser/pascaligo/AST.ml
+++ b/src/passes/1-parser/pascaligo/AST.ml
@@ -37,6 +37,7 @@ type kwd_end        = Region.t
 type kwd_for        = Region.t
 type kwd_from       = Region.t
 type kwd_function   = Region.t
+type kwd_recursive  = Region.t
 type kwd_if         = Region.t
 type kwd_in         = Region.t
 type kwd_is         = Region.t
@@ -201,6 +202,7 @@ and type_tuple = (type_expr, comma) nsepseq par reg
 (* Function and procedure declarations *)
 
 and fun_expr = {
+  kwd_recursive: kwd_recursive option;
   kwd_function : kwd_function;
   param        : parameters;
   colon        : colon;
@@ -210,6 +212,7 @@ and fun_expr = {
 }
 
 and fun_decl = {
+  kwd_recursive: kwd_recursive option;
   kwd_function : kwd_function;
   fun_name     : variable;
   param        : parameters;
diff --git a/src/passes/1-parser/pascaligo/LexToken.mli b/src/passes/1-parser/pascaligo/LexToken.mli
index 620be977c..fe6c7dc3a 100644
--- a/src/passes/1-parser/pascaligo/LexToken.mli
+++ b/src/passes/1-parser/pascaligo/LexToken.mli
@@ -89,6 +89,7 @@ type t =
 | For        of Region.t  (* "for"        *)
 | From       of Region.t  (* "from"       *)
 | Function   of Region.t  (* "function"   *)
+| Recursive  of Region.t  (* "recursive"  *)
 | If         of Region.t  (* "if"         *)
 | In         of Region.t  (* "in"         *)
 | Is         of Region.t  (* "is"         *)
diff --git a/src/passes/1-parser/pascaligo/LexToken.mll b/src/passes/1-parser/pascaligo/LexToken.mll
index 542a36c1e..4b6ab211c 100644
--- a/src/passes/1-parser/pascaligo/LexToken.mll
+++ b/src/passes/1-parser/pascaligo/LexToken.mll
@@ -87,6 +87,7 @@ type t =
 | For        of Region.t  (* "for"        *)
 | From       of Region.t  (* "from"       *)
 | Function   of Region.t  (* "function"   *)
+| Recursive  of Region.t  (* "recursive"  *)
 | If         of Region.t  (* "if"         *)
 | In         of Region.t  (* "in"         *)
 | Is         of Region.t  (* "is"         *)
@@ -199,6 +200,7 @@ let proj_token = function
 | For        region -> region, "For"
 | From       region -> region, "From"
 | Function   region -> region, "Function"
+| Recursive  region -> region, "Recursive"
 | If         region -> region, "If"
 | In         region -> region, "In"
 | Is         region -> region, "Is"
@@ -289,6 +291,7 @@ let to_lexeme = function
 | For        _ -> "for"
 | From       _ -> "from"
 | Function   _ -> "function"
+| Recursive  _ -> "recursive"
 | If         _ -> "if"
 | In         _ -> "in"
 | Is         _ -> "is"
diff --git a/src/passes/1-parser/pascaligo/ParToken.mly b/src/passes/1-parser/pascaligo/ParToken.mly
index 11275b76e..d0880433e 100644
--- a/src/passes/1-parser/pascaligo/ParToken.mly
+++ b/src/passes/1-parser/pascaligo/ParToken.mly
@@ -57,6 +57,7 @@
 %token <Region.t> False       "False"
 %token <Region.t> For         "for"
 %token <Region.t> Function    "function"
+%token <Region.t> Recursive   "recursive"
 %token <Region.t> From        "from"
 %token <Region.t> If          "if"
 %token <Region.t> In          "in"
diff --git a/src/passes/1-parser/pascaligo/Parser.mly b/src/passes/1-parser/pascaligo/Parser.mly
index f31407fca..10600d8c7 100644
--- a/src/passes/1-parser/pascaligo/Parser.mly
+++ b/src/passes/1-parser/pascaligo/Parser.mly
@@ -237,49 +237,52 @@ field_decl:
 
 
 fun_expr:
-  "function" parameters ":" type_expr "is" expr {
-    let stop   = expr_to_region $6 in
-    let region = cover $1 stop
-    and value  = {kwd_function = $1;
-                  param        = $2;
-                  colon        = $3;
-                  ret_type     = $4;
-                  kwd_is       = $5;
-                  return       = $6}
+  ioption ("recursive") "function" parameters ":" type_expr "is" expr {
+    let stop   = expr_to_region $7 in
+    let region = cover $2 stop
+    and value  = {kwd_recursive= $1;
+                  kwd_function = $2;
+                  param        = $3;
+                  colon        = $4;
+                  ret_type     = $5;
+                  kwd_is       = $6;
+                  return       = $7}
     in {region; value} }
 
 (* Function declarations *)
 
 open_fun_decl:
-  "function" fun_name parameters ":" type_expr "is"
+  ioption("recursive") "function" fun_name parameters ":" type_expr "is"
   block "with" expr {
-    Scoping.check_reserved_name $2;
-    let stop   = expr_to_region $9 in
-    let region = cover $1 stop
-    and value  = {kwd_function = $1;
-                  fun_name     = $2;
-                  param        = $3;
-                  colon        = $4;
-                  ret_type     = $5;
-                  kwd_is       = $6;
-                  block_with   = Some ($7, $8);
-                  return       = $9;
+    Scoping.check_reserved_name $3;
+    let stop   = expr_to_region $10 in
+    let region = cover $2 stop
+    and value  = {kwd_recursive= $1;
+                  kwd_function = $2;  
+                  fun_name     = $3;
+                  param        = $4;
+                  colon        = $5;
+                  ret_type     = $6;
+                  kwd_is       = $7;
+                  block_with   = Some ($8, $9);
+                  return       = $10;
                   terminator   = None;
                   attributes   = None}
     in {region; value}
   }
-| "function" fun_name parameters ":" type_expr "is" expr {
-    Scoping.check_reserved_name $2;
-    let stop   = expr_to_region $7 in
-    let region = cover $1 stop
-    and value  = {kwd_function = $1;
-                  fun_name     = $2;
-                  param        = $3;
-                  colon        = $4;
-                  ret_type     = $5;
-                  kwd_is       = $6;
+| ioption ("recursive") "function" fun_name parameters ":" type_expr "is" expr {
+    Scoping.check_reserved_name $3;
+    let stop   = expr_to_region $8 in
+    let region = cover $2 stop
+    and value  = {kwd_recursive= $1;
+                  kwd_function = $2;
+                  fun_name     = $3;
+                  param        = $4;
+                  colon        = $5;
+                  ret_type     = $6;
+                  kwd_is       = $7;
                   block_with   = None;
-                  return       = $7;
+                  return       = $8;
                   terminator   = None;
                   attributes   = None}
     in {region; value} }
diff --git a/src/passes/1-parser/pascaligo/ParserLog.ml b/src/passes/1-parser/pascaligo/ParserLog.ml
index d423006f2..93c5f7352 100644
--- a/src/passes/1-parser/pascaligo/ParserLog.ml
+++ b/src/passes/1-parser/pascaligo/ParserLog.ml
@@ -218,8 +218,9 @@ and print_fun_decl state {value; _} =
   print_terminator state terminator;
 
 and print_fun_expr state {value; _} =
-  let {kwd_function; param; colon;
+  let {kwd_recursive; kwd_function; param; colon;
        ret_type; kwd_is; return} : fun_expr = value in
+  print_token_opt   state kwd_recursive "recursive";
   print_token       state kwd_function "function";
   print_parameters  state param;
   print_token       state colon ":";
diff --git a/src/passes/1-parser/reasonligo/LexToken.mli b/src/passes/1-parser/reasonligo/LexToken.mli
index 09142e23d..4a70d9d13 100644
--- a/src/passes/1-parser/reasonligo/LexToken.mli
+++ b/src/passes/1-parser/reasonligo/LexToken.mli
@@ -95,6 +95,7 @@ type t =
 | False of Region.t
 | If of Region.t
 | Let of Region.t
+| Rec of Region.t
 | Switch of Region.t
 | Mod of Region.t
 | Or of Region.t
diff --git a/src/passes/1-parser/reasonligo/LexToken.mll b/src/passes/1-parser/reasonligo/LexToken.mll
index 842c0fee1..af1047860 100644
--- a/src/passes/1-parser/reasonligo/LexToken.mll
+++ b/src/passes/1-parser/reasonligo/LexToken.mll
@@ -80,6 +80,7 @@ type t =
 | False of Region.t
 | If of Region.t
 | Let of Region.t
+| Rec of Region.t
 | Switch of Region.t
 | Mod of Region.t
 | Or of Region.t
@@ -146,6 +147,7 @@ let proj_token = function
 | False region -> region, "False"
 | If region -> region, "If"
 | Let region -> region, "Let"
+| Rec region -> region, "Rec"
 | Switch region -> region, "Switch"
 | Mod region -> region, "Mod"
 | NOT region -> region, "!"
@@ -197,6 +199,7 @@ let to_lexeme = function
 | False _ -> "false"
 | If _ -> "if"
 | Let _ -> "let"
+| Rec _ -> "rec"
 | Mod _ -> "mod"
 | NOT _ -> "!"
 | Or _ -> "or"
diff --git a/src/passes/1-parser/reasonligo/ParToken.mly b/src/passes/1-parser/reasonligo/ParToken.mly
index b19effeca..8191b17ec 100644
--- a/src/passes/1-parser/reasonligo/ParToken.mly
+++ b/src/passes/1-parser/reasonligo/ParToken.mly
@@ -59,6 +59,7 @@
 %token <Region.t> False  "false"
 %token <Region.t> If     "if"
 %token <Region.t> Let    "let"
+%token <Region.t> Rec    "rec"
 %token <Region.t> Switch "switch"
 %token <Region.t> Mod    "mod"
 %token <Region.t> Or     "or"
diff --git a/src/passes/1-parser/reasonligo/Parser.mly b/src/passes/1-parser/reasonligo/Parser.mly
index d24e3f832..c563628be 100644
--- a/src/passes/1-parser/reasonligo/Parser.mly
+++ b/src/passes/1-parser/reasonligo/Parser.mly
@@ -650,15 +650,16 @@ case_clause(right_expr):
     in {region; value} }
 
 let_expr(right_expr):
-  seq(Attr) "let" let_binding ";" right_expr {
+  seq(Attr) "let" ioption("rec") let_binding ";" right_expr {
     let attributes = $1 in
     let kwd_let = $2 in
-    let binding = $3 in
-    let kwd_in  = $4 in
-    let body    = $5 in
-    let stop    = expr_to_region $5 in
+    let kwd_rec = $3 in
+    let binding = $4 in
+    let kwd_in  = $5 in
+    let body    = $6 in
+    let stop    = expr_to_region $6 in
     let region  = cover $2 stop
-    and value   = {kwd_let; binding; kwd_in; body; attributes}
+    and value   = {kwd_let; kwd_rec; binding; kwd_in; body; attributes}
     in ELetIn {region; value} }
 
 disj_expr_level:
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index 569df20b3..a184ea843 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -630,6 +630,7 @@ and simpl_fun lamb' : expr result =
             in
             let let_in: Raw.let_in =
               {kwd_let= Region.ghost;
+               kwd_rec= None;
                binding= let_in_binding;
                kwd_in= Region.ghost;
                body= lamb.body;
diff --git a/src/test/contracts/recursion.ligo b/src/test/contracts/recursion.ligo
index 839ba45ef..894993eac 100644
--- a/src/test/contracts/recursion.ligo
+++ b/src/test/contracts/recursion.ligo
@@ -1,4 +1,4 @@
 // Test while loops in PascaLIGO
 
-function fibo (const n : int; const acc: int) : int is
+recursive function fibo (const n : int; const acc: int) : int is
   if n<1 then acc else fibo(n-1,acc+n)
diff --git a/src/test/contracts/recursion.mligo b/src/test/contracts/recursion.mligo
index f072f00b6..2b8eb4e1b 100644
--- a/src/test/contracts/recursion.mligo
+++ b/src/test/contracts/recursion.mligo
@@ -1,5 +1,5 @@
 // Test while loops in PascaLIGO
 
-let fibo (n : int) (acc: int) : int =
+let rec fibo (n : int) (acc: int) : int =
     if (n < 1) then acc
     else fibo (n-1) (acc+n)

From 68b6e6d3b08fdc7eb0f4a5a4bb003f6cb741d32c Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Fri, 21 Feb 2020 11:41:36 +0100
Subject: [PATCH 09/43] remove option(recursive) in Parser.mly; parse error
 still

---
 src/passes/1-parser/pascaligo/Parser.mly | 57 +++++++++++++++++++++---
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/passes/1-parser/pascaligo/Parser.mly b/src/passes/1-parser/pascaligo/Parser.mly
index 10600d8c7..9dbaeafe8 100644
--- a/src/passes/1-parser/pascaligo/Parser.mly
+++ b/src/passes/1-parser/pascaligo/Parser.mly
@@ -237,10 +237,21 @@ field_decl:
 
 
 fun_expr:
-  ioption ("recursive") "function" parameters ":" type_expr "is" expr {
+  | "function" parameters ":" type_expr "is" expr {
+    let stop   = expr_to_region $6 in
+    let region = cover $1 stop
+    and value  = {kwd_recursive= None;
+                  kwd_function = $1;
+                  param        = $2;
+                  colon        = $3;
+                  ret_type     = $4;
+                  kwd_is       = $5;
+                  return       = $6}
+    in {region; value} }
+  | "recursive" "function" parameters ":" type_expr "is" expr {
     let stop   = expr_to_region $7 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= $1;
+    and value  = {kwd_recursive= Some($1);
                   kwd_function = $2;
                   param        = $3;
                   colon        = $4;
@@ -252,12 +263,46 @@ fun_expr:
 (* Function declarations *)
 
 open_fun_decl:
-  ioption("recursive") "function" fun_name parameters ":" type_expr "is"
+  "function" fun_name parameters ":" type_expr "is"
+  block "with" expr {
+    Scoping.check_reserved_name $2;
+    let stop   = expr_to_region $9 in
+    let region = cover $1 stop
+    and value  = {kwd_recursive= None;
+                  kwd_function = $1;  
+                  fun_name     = $2;
+                  param        = $3;
+                  colon        = $4;
+                  ret_type     = $5;
+                  kwd_is       = $6;
+                  block_with   = Some ($7, $8);
+                  return       = $9;
+                  terminator   = None;
+                  attributes   = None}
+    in {region; value}
+  }
+| "function" fun_name parameters ":" type_expr "is" expr {
+    Scoping.check_reserved_name $2;
+    let stop   = expr_to_region $7 in
+    let region = cover $1 stop
+    and value  = {kwd_recursive= None;
+                  kwd_function = $1;
+                  fun_name     = $2;
+                  param        = $3;
+                  colon        = $4;
+                  ret_type     = $5;
+                  kwd_is       = $6;
+                  block_with   = None;
+                  return       = $7;
+                  terminator   = None;
+                  attributes   = None}
+    in {region; value} }
+| "recursive" "function" fun_name parameters ":" type_expr "is"
   block "with" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $10 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= $1;
+    and value  = {kwd_recursive= Some($1);
                   kwd_function = $2;  
                   fun_name     = $3;
                   param        = $4;
@@ -270,11 +315,11 @@ open_fun_decl:
                   attributes   = None}
     in {region; value}
   }
-| ioption ("recursive") "function" fun_name parameters ":" type_expr "is" expr {
+| "recursive" "function" fun_name parameters ":" type_expr "is" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $8 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= $1;
+    and value  = {kwd_recursive= Some($1);
                   kwd_function = $2;
                   fun_name     = $3;
                   param        = $4;

From b51818bc4e254a731afed8e3ddcb4a82790ff33a Mon Sep 17 00:00:00 2001
From: Christian Rinderknecht <Christian.Rinderknecht@tezcore.com>
Date: Fri, 21 Feb 2020 12:30:32 +0100
Subject: [PATCH 10/43] Fixed parsing and source pretty-printing of recursive
 functions.

---
 src/passes/1-parser/pascaligo/LexToken.mll |  1 +
 src/passes/1-parser/pascaligo/Parser.mly   | 44 +++-------------------
 src/passes/1-parser/pascaligo/ParserLog.ml | 22 +++++++----
 3 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/src/passes/1-parser/pascaligo/LexToken.mll b/src/passes/1-parser/pascaligo/LexToken.mll
index 4b6ab211c..5711bbac6 100644
--- a/src/passes/1-parser/pascaligo/LexToken.mll
+++ b/src/passes/1-parser/pascaligo/LexToken.mll
@@ -364,6 +364,7 @@ let keywords = [
   (fun reg -> Or         reg);
   (fun reg -> Patch      reg);
   (fun reg -> Record     reg);
+  (fun reg -> Recursive  reg);
   (fun reg -> Remove     reg);
   (fun reg -> Set        reg);
   (fun reg -> Skip       reg);
diff --git a/src/passes/1-parser/pascaligo/Parser.mly b/src/passes/1-parser/pascaligo/Parser.mly
index 9dbaeafe8..20b89b278 100644
--- a/src/passes/1-parser/pascaligo/Parser.mly
+++ b/src/passes/1-parser/pascaligo/Parser.mly
@@ -263,47 +263,13 @@ fun_expr:
 (* Function declarations *)
 
 open_fun_decl:
-  "function" fun_name parameters ":" type_expr "is"
-  block "with" expr {
-    Scoping.check_reserved_name $2;
-    let stop   = expr_to_region $9 in
-    let region = cover $1 stop
-    and value  = {kwd_recursive= None;
-                  kwd_function = $1;  
-                  fun_name     = $2;
-                  param        = $3;
-                  colon        = $4;
-                  ret_type     = $5;
-                  kwd_is       = $6;
-                  block_with   = Some ($7, $8);
-                  return       = $9;
-                  terminator   = None;
-                  attributes   = None}
-    in {region; value}
-  }
-| "function" fun_name parameters ":" type_expr "is" expr {
-    Scoping.check_reserved_name $2;
-    let stop   = expr_to_region $7 in
-    let region = cover $1 stop
-    and value  = {kwd_recursive= None;
-                  kwd_function = $1;
-                  fun_name     = $2;
-                  param        = $3;
-                  colon        = $4;
-                  ret_type     = $5;
-                  kwd_is       = $6;
-                  block_with   = None;
-                  return       = $7;
-                  terminator   = None;
-                  attributes   = None}
-    in {region; value} }
-| "recursive" "function" fun_name parameters ":" type_expr "is"
+  "recursive"? "function" fun_name parameters ":" type_expr "is"
   block "with" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $10 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= Some($1);
-                  kwd_function = $2;  
+    and value  = {kwd_recursive= $1;
+                  kwd_function = $2;
                   fun_name     = $3;
                   param        = $4;
                   colon        = $5;
@@ -315,11 +281,11 @@ open_fun_decl:
                   attributes   = None}
     in {region; value}
   }
-| "recursive" "function" fun_name parameters ":" type_expr "is" expr {
+| "recursive"? "function" fun_name parameters ":" type_expr "is" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $8 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= Some($1);
+    and value  = {kwd_recursive= $1;
                   kwd_function = $2;
                   fun_name     = $3;
                   param        = $4;
diff --git a/src/passes/1-parser/pascaligo/ParserLog.ml b/src/passes/1-parser/pascaligo/ParserLog.ml
index 93c5f7352..ccca02968 100644
--- a/src/passes/1-parser/pascaligo/ParserLog.ml
+++ b/src/passes/1-parser/pascaligo/ParserLog.ml
@@ -609,8 +609,8 @@ and print_field_path_assign state {value; _} =
   print_nsepseq state "field_path" print_var field_path;
   print_token state equal "=";
   print_expr  state field_expr
-  
-and print_update_expr state {value; _} = 
+
+and print_update_expr state {value; _} =
   let {record; kwd_with; updates} = value in
   print_path state record;
   print_token state kwd_with "with";
@@ -859,20 +859,26 @@ and pp_declaration state = function
 and pp_attr_decl state = pp_ne_injection pp_string state
 
 and pp_fun_decl state decl =
-  let arity = 5 in
+  let arity, start =
+    match decl.kwd_recursive with
+      None -> 5,0
+    | Some _ ->
+       let state = state#pad 6 0 in
+       let () = pp_node state "recursive"
+       in 6,1 in
   let () =
-    let state = state#pad arity 0 in
+    let state = state#pad arity start in
     pp_ident state decl.fun_name in
   let () =
-    let state = state#pad arity 1 in
+    let state = state#pad arity (start + 1) in
     pp_node state "<parameters>";
     pp_parameters state decl.param in
   let () =
-    let state = state#pad arity 2 in
+    let state = state#pad arity (start + 2) in
     pp_node state "<return type>";
     pp_type_expr (state#pad 1 0) decl.ret_type in
   let () =
-    let state = state#pad arity 3 in
+    let state = state#pad arity (start + 3) in
     pp_node state "<body>";
     let statements =
       match decl.block_with with
@@ -880,7 +886,7 @@ and pp_fun_decl state decl =
       | None -> Instr (Skip Region.ghost), [] in
     pp_statements state statements in
   let () =
-    let state = state#pad arity 4 in
+    let state = state#pad arity (start + 4) in
     pp_node state "<return>";
     pp_expr (state#pad 1 0) decl.return
   in ()

From 734620a179de61d4ab18c21accbd1ad98c079ba6 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Fri, 21 Feb 2020 16:10:02 +0100
Subject: [PATCH 11/43] Keyword add for pasca,came,reason:ligo;typing error in
 contract

---
 src/passes/1-parser/cameligo/AST.ml         |  2 +-
 src/passes/1-parser/cameligo/LexToken.mll   |  3 ++-
 src/passes/1-parser/cameligo/Parser.mly     |  9 +++++----
 src/passes/1-parser/cameligo/ParserLog.ml   | 21 +++++++++++++++++----
 src/passes/1-parser/reasonligo/LexToken.mll |  3 ++-
 src/passes/1-parser/reasonligo/Parser.mly   |  7 ++++---
 src/passes/2-simplify/cameligo.ml           |  6 +++---
 src/test/contracts/recursion.religo         |  5 +++++
 src/test/integration_tests.ml               | 12 ++++++++++--
 9 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 src/test/contracts/recursion.religo

diff --git a/src/passes/1-parser/cameligo/AST.ml b/src/passes/1-parser/cameligo/AST.ml
index 969284b42..8cef386c2 100644
--- a/src/passes/1-parser/cameligo/AST.ml
+++ b/src/passes/1-parser/cameligo/AST.ml
@@ -135,7 +135,7 @@ and ast = t
 and attributes = attribute list
 
 and declaration =
-  Let      of (kwd_let * let_binding * attributes) reg
+  Let      of (kwd_let * kwd_rec option * let_binding * attributes) reg
 | TypeDecl of type_decl reg
 
 (* Non-recursive values *)
diff --git a/src/passes/1-parser/cameligo/LexToken.mll b/src/passes/1-parser/cameligo/LexToken.mll
index 360425c10..a9dc9cfe1 100644
--- a/src/passes/1-parser/cameligo/LexToken.mll
+++ b/src/passes/1-parser/cameligo/LexToken.mll
@@ -253,6 +253,7 @@ let keywords = [
   (fun reg -> End   reg);
   (fun reg -> False reg);
   (fun reg -> Fun   reg);
+  (fun reg -> Rec   reg);
   (fun reg -> If    reg);
   (fun reg -> In    reg);
   (fun reg -> Let   reg);
@@ -294,7 +295,6 @@ let reserved =
     |> add "object"
     |> add "open"
     |> add "private"
-    |> add "rec"
     |> add "sig"
     |> add "struct"
     |> add "to"
@@ -502,6 +502,7 @@ let is_kwd = function
   | End _
   | False _
   | Fun _
+  | Rec _
   | If _
   | In _
   | Let _
diff --git a/src/passes/1-parser/cameligo/Parser.mly b/src/passes/1-parser/cameligo/Parser.mly
index b09ea9d38..5d166e916 100644
--- a/src/passes/1-parser/cameligo/Parser.mly
+++ b/src/passes/1-parser/cameligo/Parser.mly
@@ -206,11 +206,12 @@ field_decl:
 (* Top-level non-recursive definitions *)
 
 let_declaration:
-  "let" let_binding seq(Attr) {
+  "let" ioption("rec") let_binding seq(Attr) {
     let kwd_let    = $1 in
-    let attributes = $3 in
-    let binding    = $2 in
-    let value      = kwd_let, binding, attributes in
+    let kwd_rec    = $2 in
+    let attributes = $4 in
+    let binding    = $3 in
+    let value      = kwd_let, kwd_rec, binding, attributes in
     let stop       = expr_to_region binding.let_rhs in
     let region     = cover $1 stop
     in {region; value} }
diff --git a/src/passes/1-parser/cameligo/ParserLog.ml b/src/passes/1-parser/cameligo/ParserLog.ml
index 36077cffc..6bf9dcc36 100644
--- a/src/passes/1-parser/cameligo/ParserLog.ml
+++ b/src/passes/1-parser/cameligo/ParserLog.ml
@@ -136,8 +136,9 @@ and print_attributes state attributes =
    ) attributes
 
 and print_statement state = function
-  Let {value=kwd_let, let_binding, attributes; _} ->
+  Let {value=kwd_let, kwd_rec, let_binding, attributes; _} ->
     print_token       state kwd_let "let";
+    print_token_opt   state kwd_rec "rec";
     print_let_binding state let_binding;
     print_attributes  state attributes
 | TypeDecl {value={kwd_type; name; eq; type_expr}; _} ->
@@ -617,9 +618,14 @@ let rec pp_ast state {decl; _} =
   List.iteri (List.length decls |> apply) decls
 
 and pp_declaration state = function
-  Let {value = (_, let_binding, attr); region} ->
+  Let {value = (_, kwd_rec, let_binding, attr); region} ->
     pp_loc_node    state "Let" region;
+    (match kwd_rec with
+    | None -> ()
+    | Some (_) -> pp_node (state#pad 0 0) "rec"
+    );
     pp_let_binding state let_binding attr;
+
 | TypeDecl {value; region} ->
     pp_loc_node  state "TypeDecl" region;
     pp_type_decl state value
@@ -855,14 +861,21 @@ and pp_fun_expr state node =
   in ()
 
 and pp_let_in state node =
-  let {binding; body; attributes; _} = node in
+  let {binding; body; attributes; kwd_rec; _} = node in
   let {binders; lhs_type; let_rhs; _} = binding in
   let fields = if lhs_type = None then 3 else 4 in
+  let fields = if kwd_rec = None then fields else fields+1 in
   let fields = if attributes = [] then fields else fields+1 in
+  let arity = 
+    match kwd_rec with
+      None -> 0
+    | Some (_) ->
+      let state = state#pad fields 0 in
+      pp_node state "rec"; 0 in
   let arity =
     let state = state#pad fields 0 in
     pp_node state "<binders>";
-    pp_binders state binders; 0 in
+    pp_binders state binders; arity in
   let arity =
     match lhs_type with
       None -> arity
diff --git a/src/passes/1-parser/reasonligo/LexToken.mll b/src/passes/1-parser/reasonligo/LexToken.mll
index af1047860..cd05538e7 100644
--- a/src/passes/1-parser/reasonligo/LexToken.mll
+++ b/src/passes/1-parser/reasonligo/LexToken.mll
@@ -235,6 +235,7 @@ let keywords = [
   (fun reg -> False  reg);
   (fun reg -> If     reg);
   (fun reg -> Let    reg);
+  (fun reg -> Rec    reg);
   (fun reg -> Switch reg);
   (fun reg -> Mod    reg);
   (fun reg -> Or     reg);
@@ -276,7 +277,6 @@ let reserved =
     |> add "of"
     |> add "open"
     |> add "private"
-    |> add "rec"
     |> add "sig"
     |> add "struct"
     |> add "then"
@@ -481,6 +481,7 @@ let is_kwd = function
 | False _
 | If _
 | Let _
+| Rec _
 | Switch _
 | Mod _
 | Or _
diff --git a/src/passes/1-parser/reasonligo/Parser.mly b/src/passes/1-parser/reasonligo/Parser.mly
index c563628be..6ab0464ac 100644
--- a/src/passes/1-parser/reasonligo/Parser.mly
+++ b/src/passes/1-parser/reasonligo/Parser.mly
@@ -264,11 +264,12 @@ field_decl:
 (* Top-level non-recursive definitions *)
 
 let_declaration:
-  seq(Attr) "let" let_binding {
+  seq(Attr) "let" ioption("rec") let_binding {
     let attributes = $1 in
     let kwd_let    = $2 in
-    let binding    = $3 in
-    let value      = kwd_let, binding, attributes in
+    let kwd_rec    = $3 in
+    let binding    = $4 in
+    let value      = kwd_let, kwd_rec, binding, attributes in
     let stop       = expr_to_region binding.let_rhs in
     let region     = cover $2 stop
     in {region; value} }
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index a184ea843..03a3f77b5 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -739,7 +739,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
       let%bind type_expression = simpl_type_expression type_expr in
       ok @@ [loc x @@ Declaration_type (Var.of_name name.value , type_expression)]
   | Let x -> (
-      let (_, let_binding, attributes), _ = r_split x in
+      let (_, _rec, let_binding, attributes), _ = r_split x in
       let inline = List.exists (fun (a: Raw.attribute) -> a.value = "inline") attributes in
       let binding = let_binding in
       let {binders; lhs_type; let_rhs} = binding in
@@ -796,11 +796,11 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
           in ok @@ decls
         | PPar {region = _ ; value = { lpar = _ ; inside = pt; rpar = _; } } ->
           (* Extract parenthetical multi-bind *)
-          let (wild, _, attributes) = fst @@ r_split x in
+          let (wild, _rec, _, attributes) = fst @@ r_split x in
           simpl_declaration
             (Let {
                 region = x.region;
-                value = (wild, {binders = (pt, []);
+                value = (wild, _rec, {binders = (pt, []);
                                 lhs_type = lhs_type;
                                 eq = Region.ghost ;
                                 let_rhs = let_rhs}, attributes)}
diff --git a/src/test/contracts/recursion.religo b/src/test/contracts/recursion.religo
new file mode 100644
index 000000000..c75be3497
--- /dev/null
+++ b/src/test/contracts/recursion.religo
@@ -0,0 +1,5 @@
+// Test while loops in PascaLIGO
+
+let rec fibo = (n : int, acc: int): int =>
+    if (n < 1) {acc;}
+    else {fibo (n-1,acc+n);};
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index bf24a6012..77159d479 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -1507,6 +1507,13 @@ let recursion_mligo () : unit result =
   let%bind _ = expect_eq program "fibo" make_input make_expected in
   ok ()
 
+let recursion_religo () : unit result =
+  let%bind program = retype_file "./contracts/recursion.religo" in
+  let make_input = e_pair (e_int 10) (e_int 0) in
+  let make_expected = e_int 55 in
+  let%bind _ = expect_eq program "fibo" make_input make_expected in
+  ok ()
+
 let guess_string_mligo () : unit result =
   let%bind program = type_file "./contracts/guess_string.mligo" in
   let make_input = fun n -> e_pair (e_int n) (e_int 42) in
@@ -2421,8 +2428,9 @@ let main = test_suite "Integration (End to End)" [
     test "failwith ligo" failwith_ligo ;
     test "failwith mligo" failwith_mligo ;
     test "assert mligo" assert_mligo ;
-    test "recursion (ligo)" recursion_ligo ;
-    test "recursion (mligo)" recursion_mligo ;
+    (* test "recursion (ligo)" recursion_ligo ; *)
+    (* test "recursion (mligo)" recursion_mligo ; *)
+    test "recursion (religo)" recursion_religo ;
     (* test "guess string mligo" guess_string_mligo ; WIP? *)
     test "lambda mligo" lambda_mligo ;
     test "lambda religo" lambda_religo ;

From b2f0e8bbc4b482b85e7b8e365e2cc59fa755d812 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Fri, 28 Feb 2020 18:58:53 +0100
Subject: [PATCH 12/43] WIP: adding E_recursive in ast

---
 src/passes/3-self_ast_simplified/helpers.ml | 11 +++
 src/passes/4-typer-new/solver.ml            |  8 ++
 src/passes/4-typer-new/typer.ml             | 63 +++++++------
 src/passes/4-typer-old/typer.ml             | 97 ++++++++++++---------
 src/passes/6-interpreter/interpreter.ml     |  2 +-
 src/passes/6-transpiler/transpiler.ml       |  6 ++
 src/stages/ast_simplified/PP.ml             | 17 +++-
 src/stages/ast_simplified/combinators.ml    |  3 +-
 src/stages/ast_simplified/combinators.mli   |  1 +
 src/stages/ast_simplified/misc.ml           |  2 +-
 src/stages/ast_simplified/types.ml          |  9 +-
 src/stages/ast_typed/PP.ml                  | 10 ++-
 src/stages/ast_typed/misc.ml                |  5 +-
 src/stages/ast_typed/misc_smart.ml          | 11 ++-
 src/stages/ast_typed/types.ml               |  7 ++
 src/stages/typesystem/misc.ml               |  6 ++
 16 files changed, 179 insertions(+), 79 deletions(-)

diff --git a/src/passes/3-self_ast_simplified/helpers.ml b/src/passes/3-self_ast_simplified/helpers.ml
index 70a130742..101f8d9ab 100644
--- a/src/passes/3-self_ast_simplified/helpers.ml
+++ b/src/passes/3-self_ast_simplified/helpers.ml
@@ -56,6 +56,9 @@ let rec fold_expression : 'a folder -> 'a -> expression -> 'a result = fun f ini
       let%bind res = self res let_result in
       ok res
     )
+  | E_recursive { lambda={result=e;_}; _} ->
+      let%bind res = self init' e in
+      ok res
 
 and fold_cases : 'a folder -> 'a -> matching_expr -> 'a result = fun f init m ->
   match m with
@@ -156,6 +159,10 @@ let rec map_expression : exp_mapper -> expression -> expression result = fun f e
       let%bind result = self result in
       return @@ E_lambda { binder ; input_type ; output_type ; result }
     )
+  | E_recursive { fun_name; fun_type; lambda} ->
+      let%bind result = self lambda.result in
+      let lambda = {lambda with result} in
+      return @@ E_recursive { fun_name; fun_type; lambda}
   | E_constant c -> (
       let%bind args = bind_map_list self c.arguments in
       return @@ E_constant {c with arguments=args}
@@ -295,6 +302,10 @@ let rec fold_map_expression : 'a fold_mapper -> 'a -> expression -> ('a * expres
       let%bind (res,result) = self init' result in
       ok ( res, return @@ E_lambda { binder ; input_type ; output_type ; result })
     )
+  | E_recursive { fun_name; fun_type; lambda} ->
+      let%bind (res, result) = self init' lambda.result in
+      let lambda = {lambda with result} in
+      ok ( res, return @@ E_recursive { fun_name; fun_type; lambda})
   | E_constant c -> (
       let%bind (res,args) = bind_fold_map_list self init' c.arguments in
       ok (res, return @@ E_constant {c with arguments=args})
diff --git a/src/passes/4-typer-new/solver.ml b/src/passes/4-typer-new/solver.ml
index 198cba936..aad418cb5 100644
--- a/src/passes/4-typer-new/solver.ml
+++ b/src/passes/4-typer-new/solver.ml
@@ -291,6 +291,14 @@ module Wrap = struct
         C_equation (result' , P_variable whole_expr)
       ] @ rhs_tv_opt', whole_expr
 
+  let recursive : T.type_expression -> (constraints * T.type_variable) =
+    fun fun_type ->
+      let fun_type = type_expression_to_type_value fun_type in
+      let whole_expr = Core.fresh_type_variable () in
+      O.[
+        C_equation (fun_type, P_variable whole_expr)
+        ], whole_expr
+
   let assign : T.type_expression -> T.type_expression -> (constraints * T.type_variable) =
     fun v e ->
       let v' = type_expression_to_type_value v in
diff --git a/src/passes/4-typer-new/typer.ml b/src/passes/4-typer-new/typer.ml
index 0ca9f8ef8..decd197fc 100644
--- a/src/passes/4-typer-new/typer.ml
+++ b/src/passes/4-typer-new/typer.ml
@@ -797,26 +797,16 @@ and type_expression : environment -> Solver.state -> ?tv_opt:O.type_expression -
   (* | _ -> ( … ) *)
 
 
-  | E_lambda {
-      binder ;
-      input_type ;
-      output_type ;
-      result ;
-    } -> (
-      let%bind input_type' = bind_map_option (evaluate_type e) input_type in
-      let%bind output_type' = bind_map_option (evaluate_type e) output_type in
-
-      let fresh : O.type_expression = t_variable (Wrap.fresh_binder ()) () in
-      let binder = fst binder in 
-      let e' = Environment.add_ez_binder (binder) fresh e in
-
-      let%bind (result , state') = type_expression e' state result in
-      let () = Printf.printf "this does not make use of the typed body, this code sounds buggy." in
-      let wrapped = Wrap.lambda fresh input_type' output_type' in
-      return_wrapped
-        (E_lambda {binder = binder; result}) (* TODO: is the type of the entire lambda enough to access the input_type=fresh; ? *)
+  | E_lambda lambda -> 
+    let%bind (lambda,state',wrapped) = type_lambda e state lambda in
+    return_wrapped (E_lambda lambda) (* TODO: is the type of the entire lambda enough to access the input_type=fresh; ? *)
         state' wrapped
-    )
+  | E_recursive {fun_name;fun_type;lambda} ->
+    let%bind fun_type = evaluate_type e fun_type in
+    let e = Environment.add_ez_binder fun_name fun_type e in
+    let%bind (lambda,state,_) = type_lambda e state lambda in
+    let wrapped = Wrap.recursive fun_type in
+    return_wrapped (E_recursive {fun_name;fun_type;lambda}) state wrapped
 
   | E_constant {cons_name=name; arguments=lst} ->
     let () = ignore (name , lst) in
@@ -838,7 +828,22 @@ and type_expression : environment -> Solver.state -> ?tv_opt:O.type_expression -
         type_constant name tv_lst tv_opt ae.location in
       return (E_constant (name' , lst')) tv
     *)
+and type_lambda e state {
+      binder ;
+      input_type ;
+      output_type ;
+      result ;
+    } =
+      let%bind input_type' = bind_map_option (evaluate_type e) input_type in
+      let%bind output_type' = bind_map_option (evaluate_type e) output_type in
 
+      let fresh : O.type_expression = t_variable (Solver.Wrap.fresh_binder ()) () in
+      let e' = Environment.add_ez_binder (binder) fresh e in
+
+      let%bind (result , state') = type_expression e' state result in
+      let () = Printf.printf "this does not make use of the typed body, this code sounds buggy." in
+      let wrapped = Solver.Wrap.lambda fresh input_type' output_type' in
+      ok (({binder;result}:O.lambda),state',wrapped)
 (* Advanced *)
 
 and type_constant (name:I.constant') (lst:O.type_expression list) (tv_opt:O.type_expression option) : (O.constant' * O.type_expression) result =
@@ -1040,12 +1045,10 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       let%bind f' = untype_expression expr1 in
       let%bind arg' = untype_expression expr2 in
       return (e_application f' arg')
-  | E_lambda {binder; result} -> (
-      let%bind io = get_t_function e.type_expression in
-      let%bind (input_type , output_type) = bind_map_pair untype_type_value io in
-      let%bind result = untype_expression result in
-      return (e_lambda (binder) (Some input_type) (Some output_type) result)
-    )
+  | E_lambda lambda ->
+      let%bind lambda = untype_lambda e.type_expression lambda in
+      let {binder;input_type;output_type;result} = lambda in
+      return (e_lambda (binder) (input_type) (output_type) result)
   | E_constructor {constructor; element} ->
       let%bind p' = untype_expression element in
       let Constructor n = constructor in
@@ -1092,6 +1095,16 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
     let%bind rhs = untype_expression rhs in
     let%bind result = untype_expression let_result in
     return (e_let_in (let_binder , (Some tv)) false inline rhs result)
+  | E_recursive {fun_name; fun_type; lambda} ->
+      let%bind lambda = untype_lambda fun_type lambda in
+      let%bind fun_type = untype_type_expression fun_type in
+      return @@ e_recursive fun_name fun_type lambda
+
+and untype_lambda ty {binder; result} : I.lambda result =
+      let%bind io = get_t_function ty in
+      let%bind (input_type , output_type) = bind_map_pair untype_type_value io in
+      let%bind result = untype_expression result in
+      ok ({binder;input_type = Some input_type; output_type = Some output_type; result}: I.lambda)
 
 (*
   Tranform a Ast_typed matching into an ast_simplified matching
diff --git a/src/passes/4-typer-old/typer.ml b/src/passes/4-typer-old/typer.ml
index eec5d3a49..448f7be08 100644
--- a/src/passes/4-typer-old/typer.ml
+++ b/src/passes/4-typer-old/typer.ml
@@ -613,45 +613,12 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
         ok (t_big_map key_type value_type ())
       in
       return (E_big_map lst') tv
-  | E_lambda {
-      binder ;
-      input_type ;
-      output_type ;
-      result ;
-    } -> (
-      let%bind input_type =
-        let%bind input_type =
-          (* Hack to take care of let_in introduced by `simplify/cameligo.ml` in ECase's hack *)
-          let default_action e () = fail @@ (needs_annotation e "the returned value") in
-          match input_type with
-          | Some ty -> ok ty
-          | None -> (
-              match result.expression_content with
-              | I.E_let_in li -> (
-                  match li.rhs.expression_content with
-                  | I.E_variable name when name = (fst binder) -> (
-                      match snd li.let_binder with
-                      | Some ty -> ok ty
-                      | None -> default_action li.rhs ()
-                    )
-                  | _ -> default_action li.rhs ()
-                )
-              | _ -> default_action result ()
-            )
-        in
-        evaluate_type e input_type in
-      let%bind output_type =
-        bind_map_option (evaluate_type e) output_type
-      in
-      let binder = fst binder in
-      let e' = Environment.add_ez_binder binder input_type e in
-      let%bind body = type_expression' ?tv_opt:output_type e' result in
-      let output_type = body.type_expression in
-      return (E_lambda {binder; result=body}) (t_function input_type output_type ())
-    )
+  | E_lambda lambda -> 
+   let%bind (lambda, lambda_type) = type_lambda e lambda in
+   return (E_lambda lambda ) lambda_type
   | E_constant {cons_name=( C_LIST_FOLD | C_MAP_FOLD | C_SET_FOLD) as opname ;
                 arguments=[
-                    ( { expression_content = (I.E_lambda { binder = (lname, None) ;
+                    ( { expression_content = (I.E_lambda { binder = lname ;
                                                    input_type = None ; 
                                                    output_type = None ; 
                                                    result }) ;
@@ -683,7 +650,7 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
       return (E_constant {cons_name=opname';arguments=lst'}) tv
   | E_constant {cons_name=C_FOLD_WHILE as opname;
                 arguments = [
-                    ( { expression_content = (I.E_lambda { binder = (lname, None) ;
+                    ( { expression_content = (I.E_lambda { binder = lname ;
                                                    input_type = None ; 
                                                    output_type = None ; 
                                                    result }) ;
@@ -773,6 +740,11 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
     let e' = Environment.add_ez_declaration (let_binder) rhs e in
     let%bind let_result = type_expression' e' let_result in
     return (E_let_in {let_binder; rhs; let_result; inline}) let_result.type_expression
+  | E_recursive {fun_name; fun_type; lambda} ->
+    let%bind fun_type = evaluate_type e fun_type in
+    let e' = Environment.add_ez_binder fun_name fun_type e in
+    let%bind (lambda,_) = type_lambda e' lambda in
+    return (E_recursive {fun_name;fun_type;lambda}) fun_type
   | E_ascription {anno_expr; type_annotation} ->
     let%bind tv = evaluate_type e type_annotation in
     let%bind expr' = type_expression' ~tv_opt:tv e anno_expr in
@@ -788,6 +760,42 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
       | Some tv' -> O.assert_type_expression_eq (tv' , type_annotation) in
     ok {expr' with type_expression=type_annotation}
 
+and type_lambda e {
+      binder ;
+      input_type ;
+      output_type ;
+      result ;
+    } = 
+      let%bind input_type =
+        let%bind input_type =
+          (* Hack to take care of let_in introduced by `simplify/cameligo.ml` in ECase's hack *)
+          let default_action e () = fail @@ (needs_annotation e "the returned value") in
+          match input_type with
+          | Some ty -> ok ty
+          | None -> (
+              match result.expression_content with
+              | I.E_let_in li -> (
+                  match li.rhs.expression_content with
+                  | I.E_variable name when name = (binder) -> (
+                      match snd li.let_binder with
+                      | Some ty -> ok ty
+                      | None -> default_action li.rhs ()
+                    )
+                  | _ -> default_action li.rhs ()
+                )
+              | _ -> default_action result ()
+            )
+        in
+        evaluate_type e input_type in
+      let%bind output_type =
+        bind_map_option (evaluate_type e) output_type
+      in
+      let e' = Environment.add_ez_binder binder input_type e in
+      let%bind body = type_expression' ?tv_opt:output_type e' result in
+      let output_type = body.type_expression in
+      ok (({binder; result=body}:O.lambda),(t_function input_type output_type ()))
+
+
 
 and type_constant (name:I.constant') (lst:O.type_expression list) (tv_opt:O.type_expression option) : (O.constant' * O.type_expression) result =
   let%bind typer = Operators.Typer.constant_typers name in
@@ -820,9 +828,11 @@ let untype_literal (l:O.literal) : I.literal result =
   | Literal_operation s -> ok (Literal_operation s)
 
 let rec untype_expression (e:O.expression) : (I.expression) result =
+  untype_expression_content e.type_expression e.expression_content
+  and untype_expression_content ty (ec:O.expression_content) : (I.expression) result =
   let open I in
   let return e = ok e in
-  match e.expression_content with
+  match ec with
   | E_literal l ->
       let%bind l = untype_literal l in
       return (e_literal l)
@@ -836,7 +846,7 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       let%bind arg' = untype_expression expr2 in
       return (e_application f' arg')
   | E_lambda {binder ; result} -> (
-      let%bind io = get_t_function e.type_expression in
+      let%bind io = get_t_function ty in
       let%bind (input_type , output_type) = bind_map_pair untype_type_expression io in
       let%bind result = untype_expression result in
       return (e_lambda (binder) (Some input_type) (Some output_type) result)
@@ -883,7 +893,12 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       let%bind tv = untype_type_expression rhs.type_expression in
       let%bind rhs = untype_expression rhs in
       let%bind result = untype_expression let_result in
-      return (I.e_let_in (let_binder , (Some tv)) false inline rhs result)
+      return (e_let_in (let_binder , (Some tv)) false inline rhs result)
+  | E_recursive {fun_name;fun_type; lambda} ->
+      let%bind fun_type = untype_type_expression fun_type in
+      let%bind unty_expr= untype_expression_content ty @@ E_lambda lambda in
+      let lambda = match unty_expr.expression_content with I.E_lambda l -> l | _ -> failwith "impossible case" in
+      return @@ e_recursive fun_name fun_type lambda
 
 and untype_matching : (O.expression -> I.expression result) -> O.matching_expr -> I.matching_expr result = fun f m ->
   let open I in
diff --git a/src/passes/6-interpreter/interpreter.ml b/src/passes/6-interpreter/interpreter.ml
index ed9f6d6d3..3ef211f83 100644
--- a/src/passes/6-interpreter/interpreter.ml
+++ b/src/passes/6-interpreter/interpreter.ml
@@ -371,7 +371,7 @@ and eval : Ast_typed.expression -> env -> value result
       | _ -> simple_fail "not yet supported case"
         (* ((ctor,name),body) *)
     )
-    | E_look_up _ ->
+    | E_look_up _ | E_recursive _ ->
       let serr = Format.asprintf "Unsupported construct :\n %a\n" Ast_typed.PP.expression term in
       simple_fail serr
 
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/6-transpiler/transpiler.ml
index 8911b76fa..d3dd96b10 100644
--- a/src/passes/6-transpiler/transpiler.ml
+++ b/src/passes/6-transpiler/transpiler.ml
@@ -379,6 +379,8 @@ and transpile_annotated_expression (ae:AST.expression) : expression result =
   | E_lambda l ->
     let%bind io = AST.get_t_function ae.type_expression in
     transpile_lambda l io
+  | E_recursive r ->
+    transpile_recursive r
   | E_list lst -> (
       let%bind t =
         trace_strong (corner_case ~loc:__LOC__ "not a list") @@
@@ -518,6 +520,10 @@ and transpile_lambda l (input_type , output_type) =
   let closure = E_closure { binder; body = result'} in
   ok @@ Combinators.Expression.make_tpl (closure , tv)
 
+and transpile_recursive {fun_name; fun_type; lambda} =
+  let closure = E_closure { binder=fun_name; body} in
+  ok @@ Combinators.Expression.make closure fun_type
+
 let transpile_declaration env (d:AST.declaration) : toplevel_statement result =
   match d with
   | Declaration_constant (name,expression, inline, _) ->
diff --git a/src/stages/ast_simplified/PP.ml b/src/stages/ast_simplified/PP.ml
index f5c2283b0..f27d9ed70 100644
--- a/src/stages/ast_simplified/PP.ml
+++ b/src/stages/ast_simplified/PP.ml
@@ -11,7 +11,9 @@ let expression_variable ppf (ev : expression_variable) : unit =
 
 
 let rec expression ppf (e : expression) =
-  match e.expression_content with
+  expression_content ppf e.expression_content
+and expression_content ppf (ec : expression_content) =
+  match ec with
   | E_literal l ->
       literal ppf l
   | E_variable n ->
@@ -40,16 +42,23 @@ let rec expression ppf (e : expression) =
   | E_look_up (ds, ind) ->
       fprintf ppf "(%a)[%a]" expression ds expression ind
   | E_lambda {binder; input_type; output_type; result} ->
-      fprintf ppf "lambda (%a:%a) : %a return %a" option_type_name binder
+      fprintf ppf "lambda (%a:%a) : %a return %a" 
+        expression_variable binder
         (PP_helpers.option type_expression)
         input_type
         (PP_helpers.option type_expression)
         output_type expression result
   | E_matching {matchee; cases; _} ->
-      fprintf ppf "match %a with %a" expression matchee (matching expression)
+      fprintf ppf "match %a with %a"
+        expression matchee (matching expression)
         cases
   | E_let_in { let_binder ; mut; rhs ; let_result; inline } ->    
-    fprintf ppf "let %a%a = %a%a in %a" option_mut mut option_type_name let_binder expression rhs option_inline inline expression let_result
+      fprintf ppf "let %a%a = %a%a in %a" option_mut mut option_type_name let_binder expression rhs option_inline inline expression let_result
+  | E_recursive { fun_name; fun_type; lambda} ->
+      fprintf ppf "rec (%a:%a => %a )" 
+        expression_variable fun_name 
+        type_expression fun_type
+        expression_content (E_lambda lambda)
   | E_skip ->
       fprintf ppf "skip"
   | E_ascription {anno_expr; type_annotation} ->
diff --git a/src/stages/ast_simplified/combinators.ml b/src/stages/ast_simplified/combinators.ml
index 21c9ee183..24b292c4f 100644
--- a/src/stages/ast_simplified/combinators.ml
+++ b/src/stages/ast_simplified/combinators.ml
@@ -178,11 +178,12 @@ let e_lambda ?loc (binder : expression_variable)
     (result : expression)
   : expression =
   location_wrap ?loc @@ E_lambda {
-    binder = (binder , input_type) ;
+    binder = binder;
     input_type = input_type ;
     output_type = output_type ;
     result ;
   }
+let e_recursive ?loc fun_name fun_type lambda = location_wrap ?loc @@ E_recursive {fun_name; fun_type; lambda}
 
 
 let e_assign_with_let ?loc var access_path expr = 
diff --git a/src/stages/ast_simplified/combinators.mli b/src/stages/ast_simplified/combinators.mli
index 37e32bb5f..5dc0af74c 100644
--- a/src/stages/ast_simplified/combinators.mli
+++ b/src/stages/ast_simplified/combinators.mli
@@ -106,6 +106,7 @@ val e_typed_big_map : ?loc:Location.t -> ( expression * expression ) list  -> ty
 val e_typed_set : ?loc:Location.t -> expression list -> type_expression -> expression
 
 val e_lambda : ?loc:Location.t -> expression_variable -> type_expression option -> type_expression option -> expression -> expression
+val e_recursive : ?loc:Location.t -> expression_variable -> type_expression -> lambda -> expression
 val e_record : ?loc:Location.t -> expr Map.String.t -> expression
 val e_update : ?loc:Location.t -> expression -> string -> expression -> expression
 val e_assign_with_let : ?loc:Location.t -> string -> string list -> expression -> ((expression_variable*type_expression option)*bool*expression*bool)
diff --git a/src/stages/ast_simplified/misc.ml b/src/stages/ast_simplified/misc.ml
index bb309048e..f2094d3ca 100644
--- a/src/stages/ast_simplified/misc.ml
+++ b/src/stages/ast_simplified/misc.ml
@@ -182,7 +182,7 @@ let rec assert_value_eq (a, b: (expression * expression )) : unit result =
   | (_a' , E_ascription b) -> assert_value_eq (a , b.anno_expr)
   | (E_variable _, _) | (E_lambda _, _)
   | (E_application _, _) | (E_let_in _, _)
-  | (E_record_accessor _, _)
+  | (E_recursive _,_) | (E_record_accessor _, _)
   | (E_look_up _, _) | (E_matching _, _)
   | (E_skip, _) -> simple_fail "comparing not a value"
 
diff --git a/src/stages/ast_simplified/types.ml b/src/stages/ast_simplified/types.ml
index de0de0934..696dbd028 100644
--- a/src/stages/ast_simplified/types.ml
+++ b/src/stages/ast_simplified/types.ml
@@ -35,6 +35,7 @@ and expression_content =
   | E_application of application
   | E_lambda of lambda
   | E_let_in of let_in
+  | E_recursive of recursive
   | E_skip
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
@@ -60,7 +61,7 @@ and constant =
 and application = {expr1: expression; expr2: expression}
 
 and lambda =
-  { binder: expression_variable * type_expression option
+  { binder: expression_variable 
   ; input_type: type_expression option
   ; output_type: type_expression option
   ; result: expression }
@@ -72,6 +73,12 @@ and let_in =
   ; let_result: expression
   ; inline: bool }
 
+and recursive = {
+  fun_name :  expression_variable;
+  fun_type : type_expression;
+  lambda : lambda;
+}
+
 and constructor = {constructor: constructor'; element: expression}
 
 and accessor = {expr: expression; label: label}
diff --git a/src/stages/ast_typed/PP.ml b/src/stages/ast_typed/PP.ml
index a0f15514b..aed4648c5 100644
--- a/src/stages/ast_typed/PP.ml
+++ b/src/stages/ast_typed/PP.ml
@@ -11,7 +11,10 @@ let expression_variable ppf (ev : expression_variable) : unit =
 
 
 let rec expression ppf (e : expression) =
-  match e.expression_content with
+  expression_content ppf e.expression_content
+
+and expression_content ppf (ec: expression_content) =
+  match ec with
   | E_literal l ->
       literal ppf l
   | E_variable n ->
@@ -47,6 +50,11 @@ let rec expression ppf (e : expression) =
   | E_let_in {let_binder; rhs; let_result; inline} ->
       fprintf ppf "let %a = %a%a in %a" expression_variable let_binder expression
         rhs option_inline inline expression let_result
+  | E_recursive { fun_name;fun_type; lambda} ->
+      fprintf ppf "rec (%a:%a => %a )" 
+        expression_variable fun_name 
+        type_expression fun_type
+        expression_content (E_lambda lambda)
 
 and assoc_expression ppf : expr * expr -> unit =
  fun (a, b) -> fprintf ppf "%a -> %a" expression a expression b
diff --git a/src/stages/ast_typed/misc.ml b/src/stages/ast_typed/misc.ml
index 9395c511a..20a778f9c 100644
--- a/src/stages/ast_typed/misc.ml
+++ b/src/stages/ast_typed/misc.ml
@@ -221,6 +221,9 @@ module Free_variables = struct
       union
         (expression b' let_result)
         (self rhs)
+    | E_recursive {fun_name;lambda;_} ->
+      let b' = union (singleton fun_name) b in
+      expression_content b' @@ E_lambda lambda
 
   and lambda : bindings -> lambda -> bindings = fun b l ->
     let b' = union (singleton l.binder) b in
@@ -529,7 +532,7 @@ let rec assert_value_eq (a, b: (expression*expression)) : unit result =
   | E_set _, _ ->
       fail @@ different_values_because_different_types "set vs. non-set" a b
   | (E_literal _, _) | (E_variable _, _) | (E_application _, _)
-  | (E_lambda _, _) | (E_let_in _, _)
+  | (E_lambda _, _) | (E_let_in _, _) | (E_recursive _, _)
   | (E_record_accessor _, _) | (E_record_update _,_)
   | (E_look_up _, _) | (E_matching _, _)
   -> fail @@ error_uncomparable_values "can't compare sequences nor loops" a b
diff --git a/src/stages/ast_typed/misc_smart.ml b/src/stages/ast_typed/misc_smart.ml
index ebe25ace2..414f01670 100644
--- a/src/stages/ast_typed/misc_smart.ml
+++ b/src/stages/ast_typed/misc_smart.ml
@@ -45,9 +45,11 @@ module Captured_variables = struct
   let empty : bindings = []
   let of_list : expression_variable list -> bindings = fun x -> x
 
-  let rec expression : bindings -> expression -> bindings result = fun b ae ->
+  let rec expression : bindings -> expression -> bindings result = fun b e ->
+    expression_content b e.environment e.expression_content
+  and expression_content : bindings -> full_environment -> expression_content -> bindings result = fun b env ec ->
     let self = expression b in
-    match ae.expression_content with
+    match ec with
     | E_lambda l -> ok @@ Free_variables.lambda empty l
     | E_literal _ -> ok empty
     | E_constant {arguments;_} ->
@@ -56,7 +58,7 @@ module Captured_variables = struct
     | E_variable name -> (
         let%bind env_element =
           trace_option (simple_error "missing var in env") @@
-          Environment.get_opt name ae.environment in
+          Environment.get_opt name env in
         match env_element.definition with
         | ED_binder -> ok empty
         | ED_declaration {expr=_ ; free_variables=_} -> simple_fail "todo"
@@ -92,6 +94,9 @@ module Captured_variables = struct
     | E_let_in li ->
       let b' = union (singleton li.let_binder) b in
       expression b' li.let_result
+    | E_recursive r -> 
+      let b' = union (singleton r.fun_name) b in
+      expression_content b' env @@ E_lambda r.lambda
 
   and matching_variant_case : type a . (bindings -> a -> bindings result) -> bindings -> ((constructor' * expression_variable) * a) -> bindings result  = fun f b ((_,n),c) ->
     f (union (singleton n) b) c
diff --git a/src/stages/ast_typed/types.ml b/src/stages/ast_typed/types.ml
index c20eef077..af143aa89 100644
--- a/src/stages/ast_typed/types.ml
+++ b/src/stages/ast_typed/types.ml
@@ -41,6 +41,7 @@ and expression_content =
   | E_application of application
   | E_lambda of lambda
   | E_let_in of let_in
+  | E_recursive of recursive
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
   | E_matching of matching
@@ -76,6 +77,12 @@ and let_in = {
     inline : inline ;
   }
 
+and recursive = {
+  fun_name : expression_variable;
+  fun_type : type_expression;
+  lambda : lambda;
+}
+
 and constructor = {
     constructor: constructor';
     element: expression ;
diff --git a/src/stages/typesystem/misc.ml b/src/stages/typesystem/misc.ml
index f6618dd43..10a59f4bc 100644
--- a/src/stages/typesystem/misc.ml
+++ b/src/stages/typesystem/misc.ml
@@ -164,6 +164,12 @@ module Substitution = struct
         let%bind rhs = s_expression ~substs rhs in
         let%bind let_result = s_expression ~substs let_result in
         ok @@ T.E_let_in { let_binder; rhs; let_result; inline }
+      | T.E_recursive { fun_name; fun_type; lambda} ->
+        let%bind fun_name = s_variable ~substs fun_name in
+        let%bind fun_type = s_type_expression ~substs fun_type in
+        let%bind sec = s_expression_content ~substs (T.E_lambda lambda) in
+        let lambda = match sec with E_lambda l -> l | _ -> failwith "impossible case" in
+        ok @@ T.E_recursive { fun_name; fun_type; lambda}
       | T.E_constructor  {constructor;element} ->
         let%bind constructor = s_constructor ~substs constructor in
         let%bind element = s_expression ~substs element in

From e7c71ae4cc4612631ab11e857a2c96c9e7772bc1 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Fri, 6 Mar 2020 23:44:28 +0100
Subject: [PATCH 13/43] passing test for Cameligo

---
 src/passes/2-simplify/cameligo.ml             |  28 ++++-
 src/passes/2-simplify/pascaligo.ml            |   8 +-
 src/passes/6-interpreter/interpreter.ml       |   4 +-
 src/passes/6-transpiler/transpiler.ml         | 114 +++++++++++++++++-
 src/passes/8-compiler/compiler_program.ml     |  24 +++-
 src/passes/operators/operators.ml             |  33 +++--
 src/stages/common/PP.ml                       |   7 +-
 src/stages/common/types.ml                    |   7 +-
 src/stages/mini_c/PP.ml                       |   7 +-
 src/stages/typesystem/shorthands.ml           |   1 +
 src/test/contracts/recursion.mligo            |   4 +-
 src/test/integration_tests.ml                 |   2 +-
 test.mligo                                    |  10 ++
 vendors/ligo-utils/tezos-utils/x_michelson.ml |   2 +
 14 files changed, 220 insertions(+), 31 deletions(-)
 create mode 100644 test.mligo

diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index 03a3f77b5..2f7e7e32e 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -70,6 +70,17 @@ module Errors = struct
        fun () -> Format.asprintf "%a" Location.pp_lift @@ param_loc)]
     in error ~data title message
 
+  let untyped_recursive_function var =
+    let title () = "" in
+    let message () =
+      Format.asprintf "\nUntyped recursive function \
+                       are not supported yet.\n" in
+    let param_loc = var.Region.region in
+    let data = [
+      ("location",
+       fun () -> Format.asprintf "%a" Location.pp_lift @@ param_loc)]
+    in error ~data title message
+
   let unsupported_tuple_pattern p =
     let title () = "" in
     let message () =
@@ -739,12 +750,11 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
       let%bind type_expression = simpl_type_expression type_expr in
       ok @@ [loc x @@ Declaration_type (Var.of_name name.value , type_expression)]
   | Let x -> (
-      let (_, _rec, let_binding, attributes), _ = r_split x in
+      let (_, recursive, let_binding, attributes), _ = r_split x in
       let inline = List.exists (fun (a: Raw.attribute) -> a.value = "inline") attributes in
       let binding = let_binding in
       let {binders; lhs_type; let_rhs} = binding in
-      let%bind (hd, _) =
-        let (hd, tl) = binders in ok (hd, tl) in
+      let (hd, _) = binders in
         match hd with
         | PTuple pt ->
           let process_variable (var_pair: pattern * Raw.expr) :
@@ -841,6 +851,18 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
         )
       | Some t -> ok @@ Some t
       in
+      let binder = Var.of_name var.value in
+      let%bind rhs' = match recursive with 
+        None -> ok @@ rhs' 
+        | Some _ -> match rhs'.expression_content with 
+          E_lambda lambda ->
+            (match lhs_type with 
+              None -> fail @@ untyped_recursive_function var 
+              | Some (lhs_type) -> 
+              let expression_content = E_recursive {fun_name=binder;fun_type=lhs_type;lambda} in
+              ok @@ {rhs' with expression_content})
+          | _ -> ok @@ rhs'
+      in
       ok @@ [loc x @@ (Declaration_constant (Var.of_name var.value , lhs_type , inline, rhs'))]
     )
 
diff --git a/src/passes/2-simplify/pascaligo.ml b/src/passes/2-simplify/pascaligo.ml
index 370e36e93..d62fc5125 100644
--- a/src/passes/2-simplify/pascaligo.ml
+++ b/src/passes/2-simplify/pascaligo.ml
@@ -1202,8 +1202,8 @@ and simpl_while_loop : Raw.while_loop -> (_ -> expression result) result = fun w
   in
   let init_rec = e_tuple [store_mutable_variable @@ captured_name_list] in
   let restore = fun expr -> List.fold_right aux captured_name_list expr in
-  let continue_expr = e_constant C_CONTINUE [for_body] in
-  let stop_expr = e_constant C_STOP [e_variable binder] in
+  let continue_expr = e_constant C_FOLD_CONTINUE [for_body] in
+  let stop_expr = e_constant C_FOLD_STOP [e_variable binder] in
   let aux_func = 
     e_lambda binder None None @@ 
     restore @@
@@ -1247,8 +1247,8 @@ and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   let restore = fun expr -> List.fold_right aux captured_name_list expr in
 
   (*Prep the lambda for the fold*)
-  let continue_expr = e_constant C_CONTINUE [restore(for_body)] in
-  let stop_expr = e_constant C_STOP [e_variable binder] in
+  let continue_expr = e_constant C_FOLD_CONTINUE [restore(for_body)] in
+  let stop_expr = e_constant C_FOLD_STOP [e_variable binder] in
   let aux_func = e_lambda binder None None @@ 
                  e_let_in (it,Some t_int) false false (e_accessor (e_variable binder) "1") @@
                  e_cond cond continue_expr (stop_expr) in
diff --git a/src/passes/6-interpreter/interpreter.ml b/src/passes/6-interpreter/interpreter.ml
index 3ef211f83..b93d0cf60 100644
--- a/src/passes/6-interpreter/interpreter.ml
+++ b/src/passes/6-interpreter/interpreter.ml
@@ -80,8 +80,8 @@ let rec apply_operator : Ast_typed.constant' -> value list -> value result =
     | ( C_IS_NAT , [ V_Ct (C_int a')    ] ) ->
       if a' > 0 then return_some @@ V_Ct (C_nat a')
       else return_none ()
-    | ( C_CONTINUE  , [ v ] ) -> ok @@ v_pair (v_bool true  , v)
-    | ( C_STOP      , [ v ] ) -> ok @@ v_pair (v_bool false , v)
+    | ( C_FOLD_CONTINUE  , [ v ] ) -> ok @@ v_pair (v_bool true  , v)
+    | ( C_FOLD_STOP      , [ v ] ) -> ok @@ v_pair (v_bool false , v)
     | ( C_ASSERTION , [ v ] ) ->
       let%bind pass = is_true v in
       if pass then return_ct @@ C_unit
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/6-transpiler/transpiler.ml
index d3dd96b10..8b39e6c4a 100644
--- a/src/passes/6-transpiler/transpiler.ml
+++ b/src/passes/6-transpiler/transpiler.ml
@@ -521,8 +521,118 @@ and transpile_lambda l (input_type , output_type) =
   ok @@ Combinators.Expression.make_tpl (closure , tv)
 
 and transpile_recursive {fun_name; fun_type; lambda} =
-  let closure = E_closure { binder=fun_name; body} in
-  ok @@ Combinators.Expression.make closure fun_type
+  let rec map_lambda : AST.expression_variable -> type_value -> AST.expression -> expression result = fun fun_name loop_type e ->
+    match e.expression_content with 
+      E_lambda {binder;result} -> 
+        let%bind body = map_lambda fun_name loop_type result in
+        ok @@ Expression.make (E_closure {binder;body}) loop_type|
+      _  -> replace_callback fun_name loop_type e
+
+  and replace_callback : AST.expression_variable -> type_value -> AST.expression -> expression result = fun fun_name loop_type e ->
+    match e.expression_content with
+      E_let_in li ->
+        let%bind let_result = replace_callback fun_name loop_type li.let_result in
+        let%bind rhs = transpile_annotated_expression li.rhs in
+        let%bind ty  = transpile_type e.type_expression in
+        ok @@ e_let_in li.let_binder ty li.inline rhs let_result |
+      E_matching m -> 
+        let%bind ty = transpile_type e.type_expression in
+        matching fun_name loop_type m ty |
+      E_application {expr1;expr2} -> (
+        match expr1.expression_content with
+        E_variable name when Var.equal fun_name name -> 
+          let%bind expr = transpile_annotated_expression expr2 in
+          ok @@ Expression.make (E_constant {cons_name=C_LOOP_CONTINUE;arguments=[expr]}) loop_type |
+        _ -> 
+          let%bind expr = transpile_annotated_expression e in
+          ok @@ Expression.make (E_constant {cons_name=C_LOOP_STOP;arguments=[expr]}) loop_type
+      ) |
+      _ -> 
+        let%bind expr = transpile_annotated_expression e in
+        ok @@ Expression.make (E_constant {cons_name=C_LOOP_STOP;arguments=[expr]}) loop_type
+  and matching : AST.expression_variable -> type_value -> AST.matching -> type_value -> expression result = fun fun_name loop_type m ty ->
+    let return ret = ok @@ Expression.make ret @@ ty in
+    let%bind expr = transpile_annotated_expression m.matchee in
+    match m.cases with
+      Match_bool {match_true; match_false} -> 
+          let%bind (t , f) = bind_map_pair (replace_callback fun_name loop_type) (match_true, match_false) in
+          return @@ E_if_bool (expr, t, f)
+      | Match_option { match_none; match_some = (name, s, tv) } ->
+          let%bind n = replace_callback fun_name loop_type match_none in
+          let%bind (tv' , s') =
+            let%bind tv' = transpile_type tv in
+            let%bind s' = replace_callback fun_name loop_type s in
+            ok (tv' , s')
+          in
+          return @@ E_if_none (expr , n , ((name , tv') , s'))
+      | Match_list {
+          match_nil ;
+          match_cons = ((hd_name) , (tl_name), match_cons, ty) ;
+        } -> (
+          let%bind nil = replace_callback fun_name loop_type match_nil in
+          let%bind cons =
+            let%bind ty' = transpile_type ty in
+            let%bind match_cons' = replace_callback fun_name loop_type match_cons in
+            ok (((hd_name , ty') , (tl_name , ty')) , match_cons')
+          in
+          return @@ E_if_cons (expr , nil , cons)
+        )
+      | Match_variant (lst , variant) -> (
+          let%bind tree =
+            trace_strong (corner_case ~loc:__LOC__ "getting lr tree") @@
+            tree_of_sum variant in
+          let%bind tree' = match tree with
+            | Empty -> fail (corner_case ~loc:__LOC__ "match empty variant")
+            | Full x -> ok x in
+          let%bind tree'' =
+            let rec aux t =
+              match (t : _ Append_tree.t') with
+              | Leaf (name , tv) ->
+                  let%bind tv' = transpile_type tv in
+                  ok (`Leaf name , tv')
+              | Node {a ; b} ->
+                  let%bind a' = aux a in
+                  let%bind b' = aux b in
+                  let tv' = Mini_c.t_union (None, snd a') (None, snd b') in
+                  ok (`Node (a' , b') , tv')
+            in aux tree'
+          in
+          let rec aux top t =
+            match t with
+            | ((`Leaf constructor_name) , tv) -> (
+                let%bind ((_ , name) , body) =
+                  trace_option (corner_case ~loc:__LOC__ "missing match clause") @@
+                  List.find_opt (fun ((constructor_name' , _) , _) -> constructor_name' = constructor_name) lst in
+                let%bind body' = replace_callback fun_name loop_type body in
+                return @@ E_let_in ((name , tv) , false , top , body')
+              )
+            | ((`Node (a , b)) , tv) ->
+                let%bind a' =
+                  let%bind a_ty = get_t_left tv in
+                  let left_var = Var.fresh ~name:"left" () in
+                  let%bind e = aux (((Expression.make (E_variable left_var) a_ty))) a in
+                  ok ((left_var , a_ty) , e)
+                in
+                let%bind b' =
+                  let%bind b_ty = get_t_right tv in
+                  let right_var = Var.fresh ~name:"right" () in
+                  let%bind e = aux (((Expression.make (E_variable right_var) b_ty))) b in
+                  ok ((right_var , b_ty) , e)
+                in
+                return @@ E_if_left (top , a' , b')
+          in
+          trace_strong (corner_case ~loc:__LOC__ "building constructor") @@
+          aux expr tree''
+       )
+      | AST.Match_tuple _ -> failwith "match_tuple not supported"
+  in
+  let%bind fun_type = transpile_type fun_type in
+  let%bind (input_type,output_type) = get_t_function fun_type in
+  let loop_type = t_union (None, input_type) (None, output_type) in
+  let%bind body = map_lambda fun_name loop_type lambda.result in
+  let expr = Expression.make_tpl (E_variable fun_name, input_type) in
+  let body = Expression.make (E_iterator (C_LOOP_LEFT, ((lambda.binder, loop_type),body), expr)) output_type in
+  ok @@ Expression.make (E_closure {binder=fun_name;body}) fun_type
 
 let transpile_declaration env (d:AST.declaration) : toplevel_statement result =
   match d with
diff --git a/src/passes/8-compiler/compiler_program.ml b/src/passes/8-compiler/compiler_program.ml
index 491b1b91a..6d24bd06b 100644
--- a/src/passes/8-compiler/compiler_program.ml
+++ b/src/passes/8-compiler/compiler_program.ml
@@ -50,13 +50,23 @@ let rec get_operator : constant' -> type_value -> expression list -> predicate r
           let%bind ty' = Mini_c.get_t_option ty in
           let%bind m_ty = Compiler_type.type_ ty' in
           ok @@ simple_constant @@ prim ~children:[m_ty] I_NONE
-
         )
       | C_NIL -> (
           let%bind ty' = Mini_c.get_t_list ty in
           let%bind m_ty = Compiler_type.type_ ty' in
           ok @@ simple_unary @@ prim ~children:[m_ty] I_NIL
         )
+      | C_LOOP_CONTINUE -> (
+          let%bind (_,ty) = get_t_or ty in
+          let%bind m_ty = Compiler_type.type_ ty in
+          let m_ty' = t_pair t_unit m_ty in
+          ok @@ simple_unary @@ prim ~children:[m_ty'] I_LEFT
+      )
+      | C_LOOP_STOP -> (
+          let%bind (ty, _) = get_t_or ty in
+          let%bind m_ty = Compiler_type.type_ ty in
+          ok @@ simple_unary @@ seq [ i_push_unit; i_pair; prim ~children:[m_ty] I_RIGHT]
+      )
       | C_SET_EMPTY -> (
           let%bind ty' = Mini_c.get_t_set ty in
           let%bind m_ty = Compiler_type.type_ ty' in
@@ -397,6 +407,18 @@ and translate_expression (expr:expression) (env:environment) : michelson result
             ]) in
           return code
         )
+      | C_LOOP_LEFT -> (
+          let%bind (_, ty) = get_t_or (snd v) in
+          let%bind m_ty = Compiler_type.type_ ty in
+          let m_ty' = t_pair t_unit m_ty in
+          let%bind code = ok (seq [
+              expr' ;
+              prim ~children:[m_ty'] I_LEFT;
+              i_loop_left body';
+              prim I_CDR
+            ]) in
+          return code
+        )
       | s -> (
           let iter = Format.asprintf "iter %a" PP.constant s in
           let error = error (thunk "bad iterator") (thunk iter) in
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index f01b5aa44..9815ec83f 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -350,10 +350,11 @@ module Simplify = struct
     (* Loop module *)
 
     | "Loop.fold_while" -> ok C_FOLD_WHILE
-    | "Loop.resume"     -> ok C_CONTINUE
-    | "continue"        -> ok C_CONTINUE (* Deprecated *)
-    | "Loop.stop"       -> ok C_STOP
-    | "stop"            -> ok C_STOP     (* Deprecated *)
+    | "Loop.loop_left"  -> ok C_LOOP_LEFT
+    | "Loop.resume"     -> ok C_FOLD_CONTINUE
+    | "continue"        -> ok C_FOLD_CONTINUE (* Deprecated *)
+    | "Loop.stop"       -> ok C_FOLD_STOP
+    | "stop"            -> ok C_FOLD_STOP     (* Deprecated *)
 
     (* Others *)
 
@@ -484,6 +485,7 @@ module Typer = struct
 
     let t_continuation = forall "a" @@ fun a -> tuple2 bool a --> pair bool a
     let t_fold_while   = forall "a" @@ fun a -> tuple2 (a --> pair bool a) a --> a
+    let t_loop_left    = forall2 "a" "b" @@ fun a b -> tuple2 (a --> sum a b) a --> b
     let t_neg          = tuple1 int --> int
     let t_and          = tuple2 bool bool --> bool
     let t_or           = tuple2 bool bool --> bool
@@ -515,8 +517,9 @@ module Typer = struct
       | C_FAILWITH            -> ok @@ t_failwith ;
       (* LOOPS *)
       | C_FOLD_WHILE          -> ok @@ t_fold_while ;
-      | C_CONTINUE            -> ok @@ t_continuation ;
-      | C_STOP                -> ok @@ t_continuation ;
+      | C_LOOP_LEFT           -> ok @@ t_loop_left;
+      | C_FOLD_CONTINUE            -> ok @@ t_continuation ;
+      | C_FOLD_STOP                -> ok @@ t_continuation ;
       (* MATH *)
       | C_NEG                 -> ok @@ t_neg ;
       | C_ABS                 -> ok @@ t_abs ;
@@ -1018,6 +1021,15 @@ module Typer = struct
     let%bind () = assert_eq_1 (t_pair (t_bool ()) init ()) result
     in ok init
 
+  let loop_left = typer_2 "LOOP_LEFT" @@ fun _body _init ->
+    failwith ("should not be used before mini-c")
+    (* 
+    let%bind (arg, result) = get_t_function body in
+    let%bind () = assert_eq_1 arg init in
+    let%bind () = assert_eq_1 arg result in (* Right now, only able to compile when both types are equals *)
+    ok result
+  *)
+
   (* Continue and Stop are just syntactic sugar for building a pair (bool * a') *)
   let continue = typer_1 "CONTINUE" @@ fun arg ->
     ok @@ t_pair (t_bool ()) arg ()
@@ -1115,8 +1127,9 @@ module Typer = struct
     | C_FAILWITH            -> ok @@ failwith_ ;
     (* LOOPS *)
     | C_FOLD_WHILE          -> ok @@ fold_while ;
-    | C_CONTINUE            -> ok @@ continue ;
-    | C_STOP                -> ok @@ stop ;
+    | C_LOOP_LEFT           -> ok @@ loop_left;
+    | C_FOLD_CONTINUE       -> ok @@ continue ;
+    | C_FOLD_STOP           -> ok @@ stop ;
      (* MATH *)
     | C_NEG                 -> ok @@ neg ;
     | C_ABS                 -> ok @@ abs ;
@@ -1248,8 +1261,8 @@ module Compiler = struct
     | C_MAP_ADD         -> ok @@ simple_ternary @@ seq [dip (i_some) ; prim I_UPDATE]
     | C_MAP_UPDATE      -> ok @@ simple_ternary @@ prim I_UPDATE
     | C_FOLD_WHILE      -> ok @@ simple_binary @@ seq [i_swap ; (i_push (prim T_bool) (prim D_True));prim ~children:[seq [dip i_dup; i_exec; i_unpair]] I_LOOP ;i_swap ; i_drop]
-    | C_CONTINUE        -> ok @@ simple_unary @@ seq [(i_push (prim T_bool) (prim D_True)); i_pair]
-    | C_STOP            -> ok @@ simple_unary @@ seq [(i_push (prim T_bool) (prim D_False)); i_pair]
+    | C_FOLD_CONTINUE   -> ok @@ simple_unary @@ seq [(i_push (prim T_bool) (prim D_True)); i_pair]
+    | C_FOLD_STOP       -> ok @@ simple_unary @@ seq [(i_push (prim T_bool) (prim D_False)); i_pair]
     | C_SIZE            -> ok @@ simple_unary @@ prim I_SIZE
     | C_FAILWITH        -> ok @@ simple_unary @@ prim I_FAILWITH
     | C_ASSERT_INFERRED -> ok @@ simple_binary @@ i_if (seq [i_failwith]) (seq [i_drop ; i_push_unit])
diff --git a/src/stages/common/PP.ml b/src/stages/common/PP.ml
index ee232f044..c3557f3d5 100644
--- a/src/stages/common/PP.ml
+++ b/src/stages/common/PP.ml
@@ -56,8 +56,11 @@ let constant ppf : constant' -> unit = function
   | C_ITER                  -> fprintf ppf "ITER"
   | C_FOLD                  -> fprintf ppf "FOLD"
   | C_FOLD_WHILE            -> fprintf ppf "FOLD_WHILE"
-  | C_CONTINUE              -> fprintf ppf "CONTINUE"
-  | C_STOP                  -> fprintf ppf "STOP"
+  | C_FOLD_CONTINUE         -> fprintf ppf "CONTINUE"
+  | C_FOLD_STOP             -> fprintf ppf "STOP"
+  | C_LOOP_LEFT             -> fprintf ppf "LOOP_LEFT"
+  | C_LOOP_CONTINUE         -> fprintf ppf "LOOP_CONTINUE"
+  | C_LOOP_STOP             -> fprintf ppf "LOOP_STOP"
   (* MATH *)
   | C_NEG                   -> fprintf ppf "NEG"
   | C_ABS                   -> fprintf ppf "ABS"
diff --git a/src/stages/common/types.ml b/src/stages/common/types.ml
index 1eacb7f7c..20964d3b6 100644
--- a/src/stages/common/types.ml
+++ b/src/stages/common/types.ml
@@ -197,8 +197,11 @@ and constant' =
   (* Loops *)
   | C_ITER
   | C_FOLD_WHILE
-  | C_CONTINUE
-  | C_STOP
+  | C_FOLD_CONTINUE
+  | C_FOLD_STOP
+  | C_LOOP_LEFT
+  | C_LOOP_CONTINUE
+  | C_LOOP_STOP
   | C_FOLD
   (* MATH *)
   | C_NEG
diff --git a/src/stages/mini_c/PP.ml b/src/stages/mini_c/PP.ml
index 7626081cc..dfbbfdd64 100644
--- a/src/stages/mini_c/PP.ml
+++ b/src/stages/mini_c/PP.ml
@@ -149,8 +149,11 @@ and constant ppf : constant' -> unit = function
   (* Loops *)
   | C_FOLD                  -> fprintf ppf "FOLD"
   | C_FOLD_WHILE            -> fprintf ppf "FOLD_WHILE"
-  | C_CONTINUE              -> fprintf ppf "CONTINUE"
-  | C_STOP                  -> fprintf ppf "STOP"
+  | C_FOLD_CONTINUE         -> fprintf ppf "CONTINUE"
+  | C_FOLD_STOP             -> fprintf ppf "STOP"
+  | C_LOOP_LEFT             -> fprintf ppf "LOOP_LEFT"
+  | C_LOOP_CONTINUE         -> fprintf ppf "LOOP_CONTINUE"
+  | C_LOOP_STOP             -> fprintf ppf "LOOP_STOP"
   | C_ITER                  -> fprintf ppf "ITER"
   (* MATH *)
   | C_NEG                   -> fprintf ppf "NEG"
diff --git a/src/stages/typesystem/shorthands.ml b/src/stages/typesystem/shorthands.ml
index 81a341b32..844be70a3 100644
--- a/src/stages/typesystem/shorthands.ml
+++ b/src/stages/typesystem/shorthands.ml
@@ -48,6 +48,7 @@ let (=>) tc ty = (tc , ty)
 let (-->) arg ret = P_constant (C_arrow  , [arg; ret])
 let option t  = P_constant (C_option  , [t])
 let pair a b  = P_constant (C_record , [a; b])
+let sum  a b  = P_constant (C_variant, [a; b])
 let map  k v  = P_constant (C_map   , [k; v])
 let unit      = P_constant (C_unit    , [])
 let list   t  = P_constant (C_list    , [t])
diff --git a/src/test/contracts/recursion.mligo b/src/test/contracts/recursion.mligo
index 2b8eb4e1b..13e86518b 100644
--- a/src/test/contracts/recursion.mligo
+++ b/src/test/contracts/recursion.mligo
@@ -1,5 +1,5 @@
 // Test while loops in PascaLIGO
 
-let rec fibo (n : int) (acc: int) : int =
+let rec fibo ((n,acc):int * int) : int =
     if (n < 1) then acc
-    else fibo (n-1) (acc+n)
+    else fibo (n-1, acc+n)
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 77159d479..66b9bdf05 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -2429,7 +2429,7 @@ let main = test_suite "Integration (End to End)" [
     test "failwith mligo" failwith_mligo ;
     test "assert mligo" assert_mligo ;
     (* test "recursion (ligo)" recursion_ligo ; *)
-    (* test "recursion (mligo)" recursion_mligo ; *)
+    test "recursion (mligo)" recursion_mligo ;
     test "recursion (religo)" recursion_religo ;
     (* test "guess string mligo" guess_string_mligo ; WIP? *)
     test "lambda mligo" lambda_mligo ;
diff --git a/test.mligo b/test.mligo
new file mode 100644
index 000000000..6ee619aaa
--- /dev/null
+++ b/test.mligo
@@ -0,0 +1,10 @@
+type parameter = int * int
+
+let rec fibo ((n,acc):int * int) : int =
+    if (n < 1) then acc
+    else fibo (n-1, acc+n)
+
+let main ((p,s):parameter*int) = 
+    let s = fibo (p) in
+    ([] : operation list),s
+
diff --git a/vendors/ligo-utils/tezos-utils/x_michelson.ml b/vendors/ligo-utils/tezos-utils/x_michelson.ml
index c6af850a3..6bb075cf2 100644
--- a/vendors/ligo-utils/tezos-utils/x_michelson.ml
+++ b/vendors/ligo-utils/tezos-utils/x_michelson.ml
@@ -78,6 +78,8 @@ let i_dug n : michelson = prim ~children:[Int (0 , Z.of_int n)] I_DUG
 let i_unpair = seq [i_dup ; i_car ; dip i_cdr]
 let i_unpiar = seq [i_dup ; i_cdr ; dip i_car]
 
+let i_loop_left body = prim ~children:[seq[body; dip i_drop]] I_LOOP_LEFT
+
 let rec strip_annots : michelson -> michelson = function
   | Seq(l, s) -> Seq(l, List.map strip_annots s)
   | Prim (l, p, lst, _) -> Prim (l, p, List.map strip_annots lst, [])

From b15d9a51233e7454be18679c6912a9e754cfb9c0 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Sat, 7 Mar 2020 01:19:22 +0100
Subject: [PATCH 14/43] compiling Pascaligo

---
 src/bin/expect_tests/contract_tests.ml |  6 +-
 src/passes/2-simplify/pascaligo.ml     | 92 ++++++++++++++++++--------
 src/test/integration_tests.ml          |  2 +-
 test.mligo                             | 10 ---
 4 files changed, 67 insertions(+), 43 deletions(-)
 delete mode 100644 test.mligo

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 49d0d9ae1..9bd5723bf 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P : ( nat * string ):Some(( nat * string ))) : None return let rhs#809 = #P in let p = rhs#809.0 in let s = rhs#809.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#810 = #P in let p = rhs#810.0 in let s = rhs#810.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P : ( nat * int ):Some(( nat * int ))) : None return let rhs#812 = #P in let p = rhs#812.0 in let s = rhs#812.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#813 = #P in let p = rhs#813.0 in let s = rhs#813.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
@@ -1344,4 +1344,4 @@ let%expect_test _ =
     * Visit our documentation: https://ligolang.org/docs/intro/what-and-why/
     * Ask a question on our Discord: https://discord.gg/9rhYaEt
     * Open a gitlab issue: https://gitlab.com/ligolang/ligo/issues/new
-    * Check the changelog by running 'ligo changelog' |}]
\ No newline at end of file
+    * Check the changelog by running 'ligo changelog' |}]
diff --git a/src/passes/2-simplify/pascaligo.ml b/src/passes/2-simplify/pascaligo.ml
index d62fc5125..6282766c1 100644
--- a/src/passes/2-simplify/pascaligo.ml
+++ b/src/passes/2-simplify/pascaligo.ml
@@ -184,6 +184,17 @@ module Errors = struct
     ] in
     error ~data title message
 
+  let _untyped_recursive_function var =
+    let title () = "" in
+    let message () =
+      Format.asprintf "\nUntyped recursive function \
+                       are not supported yet.\n" in
+    let param_loc = var.Region.region in
+    let data = [
+      ("location",
+       fun () -> Format.asprintf "%a" Location.pp_lift @@ param_loc)]
+    in error ~data title message
+
   (* Logging *)
 
   let simplifying_instruction t =
@@ -659,7 +670,7 @@ and simpl_fun_decl :
       ((expression_variable * type_expression option) * expression) result =
   fun ~loc x ->
   let open! Raw in
-  let {fun_name; param; ret_type; block_with;
+  let {kwd_recursive;fun_name; param; ret_type; block_with;
        return; attributes} : fun_decl = x in
   let inline =
     match attributes with
@@ -683,11 +694,17 @@ and simpl_fun_decl :
        let%bind result =
          let aux prec cur = cur (Some prec) in
          bind_fold_right_list aux result body in
-       let expression : expression = e_lambda ~loc (Var.of_name binder) (Some input_type)
-           (Some output_type) result in
-       let type_annotation =
-         Some (make_t @@ T_arrow {type1=input_type;type2=output_type}) in
-       ok ((Var.of_name fun_name.value, type_annotation), expression)
+      let binder = Var.of_name binder in
+      let fun_name = Var.of_name fun_name.value in
+      let fun_type = t_function input_type output_type in
+      let expression : expression = 
+        e_lambda ~loc binder (Some input_type)(Some output_type) result in
+      let%bind expression = match kwd_recursive with
+        None -> ok @@ expression |
+        Some _ -> ok @@ e_recursive ~loc fun_name fun_type 
+        @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
+      in
+       ok ((fun_name, Some fun_type), expression)
      )
    | lst -> (
        let lst = npseq_to_list lst in
@@ -713,10 +730,16 @@ and simpl_fun_decl :
        let%bind result =
          let aux prec cur = cur (Some prec) in
          bind_fold_right_list aux result body in
-       let expression =
-         e_lambda ~loc binder (Some (input_type)) (Some output_type) result in
-       let type_annotation = Some (make_t @@ T_arrow {type1=input_type; type2=output_type}) in
-       ok ((Var.of_name fun_name.value, type_annotation), expression)
+      let fun_name = Var.of_name fun_name.value in
+      let fun_type = t_function input_type output_type in
+      let expression : expression = 
+        e_lambda ~loc binder (Some input_type)(Some output_type) result in
+      let%bind expression = match kwd_recursive with
+        None -> ok @@ expression |
+        Some _ -> ok @@ e_recursive ~loc fun_name fun_type 
+        @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
+      in
+       ok ((fun_name, Some fun_type), expression)
      )
   )
 
@@ -724,23 +747,29 @@ and simpl_fun_expression :
   loc:_ -> Raw.fun_expr -> (type_expression option * expression) result =
   fun ~loc x ->
   let open! Raw in
-  let {param;ret_type;return;_} : fun_expr = x in
+  let {kwd_recursive;param;ret_type;return} : fun_expr = x in
   let statements = [] in
   (match param.value.inside with
-     a, [] -> (
-       let%bind input = simpl_param a in
-       let (binder , input_type) = input in
-       let%bind instructions = simpl_statement_list statements in
-       let%bind result = simpl_expression return in
-       let%bind output_type = simpl_type_expression ret_type in
-       let body = instructions in
-       let%bind result =
-         let aux prec cur = cur (Some prec) in
-         bind_fold_right_list aux result body in
-       let expression : expression = e_lambda ~loc (Var.of_name binder) (Some input_type)
-           (Some output_type) result in
-       let type_annotation = Some (make_t @@ T_arrow {type1=input_type;type2=output_type}) in
-       ok (type_annotation , expression)
+    a, [] -> (
+      let%bind input = simpl_param a in
+      let (binder , input_type) = input in
+      let%bind instructions = simpl_statement_list statements in
+      let%bind result = simpl_expression return in
+      let%bind output_type = simpl_type_expression ret_type in
+      let body = instructions in
+      let%bind result =
+        let aux prec cur = cur (Some prec) in
+        bind_fold_right_list aux result body in
+      let binder = Var.of_name binder in
+      let fun_type = t_function input_type output_type in
+      let expression : expression = 
+        e_lambda ~loc binder (Some input_type)(Some output_type) result in
+      let%bind expression = match kwd_recursive with
+        None -> ok @@ expression |
+        Some _ -> ok @@ e_recursive ~loc binder fun_type 
+        @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
+      in
+      ok (Some fun_type , expression)
      )
    | lst -> (
        let lst = npseq_to_list lst in
@@ -765,10 +794,15 @@ and simpl_fun_expression :
        let%bind result =
          let aux prec cur = cur (Some prec) in
          bind_fold_right_list aux result body in
-       let expression =
-         e_lambda ~loc binder (Some (input_type)) (Some output_type) result in
-       let type_annotation = Some (make_t @@ T_arrow {type1=input_type;type2=output_type}) in
-       ok (type_annotation , expression)
+      let fun_type = t_function input_type output_type in
+      let expression : expression = 
+        e_lambda ~loc binder (Some input_type)(Some output_type) result in
+      let%bind expression = match kwd_recursive with
+        None -> ok @@ expression |
+        Some _ -> ok @@ e_recursive ~loc binder fun_type 
+        @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
+      in
+      ok (Some fun_type , expression)
      )
   )
 
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 66b9bdf05..60b8f57bb 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -2428,7 +2428,7 @@ let main = test_suite "Integration (End to End)" [
     test "failwith ligo" failwith_ligo ;
     test "failwith mligo" failwith_mligo ;
     test "assert mligo" assert_mligo ;
-    (* test "recursion (ligo)" recursion_ligo ; *)
+    test "recursion (ligo)" recursion_ligo ;
     test "recursion (mligo)" recursion_mligo ;
     test "recursion (religo)" recursion_religo ;
     (* test "guess string mligo" guess_string_mligo ; WIP? *)
diff --git a/test.mligo b/test.mligo
deleted file mode 100644
index 6ee619aaa..000000000
--- a/test.mligo
+++ /dev/null
@@ -1,10 +0,0 @@
-type parameter = int * int
-
-let rec fibo ((n,acc):int * int) : int =
-    if (n < 1) then acc
-    else fibo (n-1, acc+n)
-
-let main ((p,s):parameter*int) = 
-    let s = fibo (p) in
-    ([] : operation list),s
-

From fa5983e9d33b9490650e8de3f46d3eb15cf9ba97 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Sat, 7 Mar 2020 02:54:57 +0100
Subject: [PATCH 15/43] fix contrat religo

---
 src/test/contracts/recursion.religo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/contracts/recursion.religo b/src/test/contracts/recursion.religo
index c75be3497..71f016962 100644
--- a/src/test/contracts/recursion.religo
+++ b/src/test/contracts/recursion.religo
@@ -1,5 +1,5 @@
 // Test while loops in PascaLIGO
 
-let rec fibo = (n : int, acc: int): int =>
+let rec fibo = ((n, acc) : (int,int)): int =>
     if (n < 1) {acc;}
-    else {fibo (n-1,acc+n);};
+    else {fibo ((n-1,acc+n));};

From c46002b1605d03537bc6621fce2b1964631e39cb Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 9 Mar 2020 00:13:07 +0100
Subject: [PATCH 16/43] modifying doc and test for loops (Cameligo and
 pascaligo)

---
 gitlab-pages/docs/language-basics/loops.md | 69 ++++------------------
 src/bin/expect_tests/contract_tests.ml     |  4 +-
 src/passes/2-simplify/cameligo.ml          | 53 +++++++++++++++--
 src/passes/2-simplify/pascaligo.ml         | 12 ++--
 src/passes/6-transpiler/transpiler.ml      | 28 ++++++---
 src/stages/ast_typed/combinators.ml        | 11 ++++
 src/stages/ast_typed/combinators.mli       |  1 +
 src/test/contracts/loop.mligo              | 31 +++++-----
 src/test/contracts/loop.religo             | 26 ++++----
 9 files changed, 124 insertions(+), 111 deletions(-)

diff --git a/gitlab-pages/docs/language-basics/loops.md b/gitlab-pages/docs/language-basics/loops.md
index 8f81c93ae..e6d26adea 100644
--- a/gitlab-pages/docs/language-basics/loops.md
+++ b/gitlab-pages/docs/language-basics/loops.md
@@ -57,45 +57,21 @@ constant, therefore it makes no sense in CameLIGO to feature loops,
 which we understand as syntactic constructs where the state of a
 stopping condition is mutated, as with "while" loops in PascaLIGO.
 
-Instead, CameLIGO implements a *folded operation* by means of a
-predefined function named `Loop.fold_while`. It takes an initial value
-of a certain type, called an *accumulator*, and repeatedly calls a
-given function, called *folded function*, that takes that
-accumulator and returns the next value of the accumulator, until a
-condition is met and the fold stops with the final value of the
-accumulator. The iterated function needs to have a special type: if
-the type of the accumulator is `t`, then it must have the type `bool *
-t` (not simply `t`). It is the boolean value that denotes whether the
-stopping condition has been reached.
+Instead, CameLIGO loops are written by means of a tail recursive function
 
 Here is how to compute the greatest common divisors of two natural
 numbers by means of Euclid's algorithm:
 
 ```cameligo group=a
-let iter (x,y : nat * nat) : bool * (nat * nat) =
-  if y = 0n then false, (x,y) else true, (y, x mod y)
+let rec iter (x,y : nat * nat) : nat =
+  if y = 0n then x else iter (y, x mod y)
 
 let gcd (x,y : nat * nat) : nat =
   let x,y = if x < y then y,x else x,y in
-  let x,y = Loop.fold_while iter (x,y)
-  in x
+  iter (x,y)
 ```
 
-To ease the writing and reading of the iterated functions (here,
-`iter`), two predefined functions are provided: `Loop.resume` and
-`Loop.stop`:
-
-```cameligo group=a
-let iter (x,y : nat * nat) : bool * (nat * nat) =
-  if y = 0n then Loop.stop (x,y) else Loop.resume (y, x mod y)
-
-let gcd (x,y : nat * nat) : nat =
-  let x,y = if x < y then y,x else x,y in
-  let x,y = Loop.fold_while iter (x,y)
-  in x
-```
-
-> Note that `stop` and `continue` (now `Loop.resume`) are
+> Note that `fold_while`, `stop` and `continue` (now `Loop.resume`) are
 > *deprecated*.
 
 You can call the function `gcd` defined above using the LIGO compiler
@@ -114,47 +90,22 @@ constant, therefore it makes no sense in ReasonLIGO to feature loops,
 which we understand as syntactic constructs where the state of a
 stopping condition is mutated, as with "while" loops in PascaLIGO.
 
-Instead, ReasonLIGO features a *fold operation* as a predefined
-function named `Loop.fold_while`. It takes an initial value of a
-certain type, called an *accumulator*, and repeatedly calls a given
-function, called *iterated function*, that takes that accumulator and
-returns the next value of the accumulator, until a condition is met
-and the fold stops with the final value of the accumulator. The
-iterated function needs to have a special type: if the type of the
-accumulator is `t`, then it must have the type `bool * t` (not simply
-`t`). It is the boolean value that denotes whether the stopping
-condition has been reached.
+Instead, ReasonLIGO loops are written by means of tail recursive functions
 
 Here is how to compute the greatest common divisors of two natural
 numbers by means of Euclid's algorithm:
 
 ```reasonligo group=a
-let iter = ((x,y) : (nat, nat)) : (bool, (nat, nat)) =>
-  if (y == 0n) { (false, (x,y)); } else { (true, (y, x mod y)); };
+let rec iter = ((x,y) : (nat, nat)) : nat =>
+  if (y == 0n) { x; } else { iter ((y, x mod y)); };
 
 let gcd = ((x,y) : (nat, nat)) : nat => {
   let (x,y) = if (x < y) { (y,x); } else { (x,y); };
-  let (x,y) = Loop.fold_while (iter, (x,y));
-  x
+  iter ((x,y))
 };
 ```
 
-To ease the writing and reading of the iterated functions (here,
-`iter`), two predefined functions are provided: `Loop.resume` and
-`Loop.stop`:
-
-```reasonligo group=b
-let iter = ((x,y) : (nat, nat)) : (bool, (nat, nat)) =>
-  if (y == 0n) { Loop.stop ((x,y)); } else { Loop.resume ((y, x mod y)); };
-
-let gcd = ((x,y) : (nat, nat)) : nat => {
-  let (x,y) = if (x < y) { (y,x); } else { (x,y); };
-  let (x,y) = Loop.fold_while (iter, (x,y));
-  x
-};
-```
-
-> Note that `stop` and `continue` (now `Loop.resume`) are
+> Note that `fold_while`, `stop` and `continue` (now `Loop.resume`) are
 > *deprecated*.
 
 </Syntax>
diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 9bd5723bf..1bb5d7969 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#810 = #P in let p = rhs#810.0 in let s = rhs#810.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#808 = #P in let p = rhs#808.0 in let s = rhs#808.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#813 = #P in let p = rhs#813.0 in let s = rhs#813.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index 2f7e7e32e..0895c5323 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -345,7 +345,7 @@ let rec simpl_expression :
   trace (simplifying_expr t) @@
   match t with
     Raw.ELetIn e ->
-      let Raw.{binding; body; attributes; _} = e.value in
+      let Raw.{kwd_rec; binding; body; attributes; _} = e.value in
       let inline = List.exists (fun (a: Raw.attribute) -> a.value = "inline") attributes in
       let Raw.{binders; lhs_type; let_rhs; _} = binding in
       begin match binders with
@@ -393,10 +393,50 @@ let rec simpl_expression :
           (chain_let_in tl body)
         | [] -> body (* Precluded by corner case assertion above *)
       in
-      if List.length prep_vars = 1
-      then ok (chain_let_in prep_vars body)
-      (* Bind the right hand side so we only evaluate it once *)
-      else ok (e_let_in (rhs_b, ty_opt) false inline rhs' (chain_let_in prep_vars body))
+      let%bind ty_opt = match ty_opt with 
+      | None -> (match let_rhs with 
+        | EFun {value={binders;lhs_type}} -> 
+          let f_args = nseq_to_list (binders) in
+          let%bind lhs_type' = bind_map_option (fun x -> simpl_type_expression (snd x)) lhs_type in
+          let%bind ty = bind_map_list typed_pattern_to_typed_vars f_args in
+          let aux acc ty = Option.map (t_function (snd ty)) acc in
+          ok @@ (List.fold_right' aux lhs_type' ty)
+        | _ -> ok None
+        )
+      | Some t -> ok @@ Some t
+      in
+      let%bind ret_expr = if List.length prep_vars = 1
+        then ok (chain_let_in prep_vars body)
+        (* Bind the right hand side so we only evaluate it once *)
+        else ok (e_let_in (rhs_b, ty_opt) false inline rhs' (chain_let_in prep_vars body))
+      in
+      let%bind ret_expr = match kwd_rec with 
+        | None -> ok @@ ret_expr
+        | Some _ -> 
+          match ret_expr.expression_content with 
+            | E_let_in li -> (
+              let%bind lambda = 
+                let rec aux rhs = match rhs.expression_content with
+                  | E_lambda l -> ok @@ l
+                  | E_ascription a -> aux a.anno_expr
+                  | _ -> fail @@ corner_case "recursive only supported for lambda"
+                in
+                aux rhs'
+              in
+              let fun_name = fst @@ List.hd prep_vars in
+              let%bind fun_type = match ty_opt with 
+                | Some t -> ok @@ t
+                | None -> match rhs'.expression_content with 
+                      | E_ascription a -> ok a.type_annotation
+                      | _ -> fail @@ untyped_recursive_function e
+              in
+              let expression_content = E_recursive {fun_name;fun_type;lambda} in
+              let expression_content = E_let_in {li with rhs = {li.rhs with  expression_content}} in
+              ok @@ {ret_expr with expression_content}
+          )
+          | _ -> fail @@ corner_case "impossible"
+      in
+      ok ret_expr
 
       (* let f p1 ps... = rhs in body *)
       | (f, p1 :: ps) ->
@@ -670,7 +710,8 @@ and simpl_fun lamb' : expr result =
       e_lambda ~loc (binder) (Some input_type) output_type (layer_arguments tl)
     | [] -> body
   in
-  return @@ layer_arguments params'
+  let ret_lamb = layer_arguments params' in
+  return @@ ret_lamb
 
 
 and simpl_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
diff --git a/src/passes/2-simplify/pascaligo.ml b/src/passes/2-simplify/pascaligo.ml
index 6282766c1..fa87cbf15 100644
--- a/src/passes/2-simplify/pascaligo.ml
+++ b/src/passes/2-simplify/pascaligo.ml
@@ -1263,11 +1263,12 @@ and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   let%bind bound = simpl_expression fi.bound in
   let cond = e_annotation (e_constant C_LE [var ; bound]) t_bool in
   let step = e_int 1 in
+  let continue_expr = e_constant C_FOLD_CONTINUE [(e_variable binder)] in
   let ctrl = 
-    e_let_in (it,Some t_int) false false (e_constant C_ADD [ var ; step ]) 
-    (e_let_in (binder, None) false false (e_update (e_variable binder) "1" var)
-    (e_variable binder))
-    in
+    e_let_in (it,Some t_int) false false (e_constant C_ADD [ var ; step ]) @@
+    e_let_in (binder, None) false false (e_update (e_variable binder) "1" var)@@
+    continue_expr
+  in
   (* Modify the body loop*)
   let%bind for_body = simpl_block fi.block.value in
   let%bind for_body = for_body @@ Some ctrl in
@@ -1281,11 +1282,10 @@ and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   let restore = fun expr -> List.fold_right aux captured_name_list expr in
 
   (*Prep the lambda for the fold*)
-  let continue_expr = e_constant C_FOLD_CONTINUE [restore(for_body)] in
   let stop_expr = e_constant C_FOLD_STOP [e_variable binder] in
   let aux_func = e_lambda binder None None @@ 
                  e_let_in (it,Some t_int) false false (e_accessor (e_variable binder) "1") @@
-                 e_cond cond continue_expr (stop_expr) in
+                 e_cond cond (restore for_body) (stop_expr) in
 
   (* Make the fold_while en precharge the vakye *)
   let loop = e_constant C_FOLD_WHILE [aux_func; e_variable env_rec] in
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/6-transpiler/transpiler.ml
index 8b39e6c4a..9b2d3308d 100644
--- a/src/passes/6-transpiler/transpiler.ml
+++ b/src/passes/6-transpiler/transpiler.ml
@@ -101,6 +101,15 @@ them. please report this to the developers." in
       ("value" , fun () -> Format.asprintf "%a" Mini_c.PP.value value) ;
     ] in
     error ~data title content
+  
+  let unsupported_recursive_function expression_variable =
+    let title () = "unsupported recursive function yet" in
+    let content () = "only fuction with one variable are supported" in
+    let data = [
+      ("value" , fun () -> Format.asprintf "%a" AST.PP.expression_variable expression_variable) ;
+    ] in
+    error ~data title content
+
 
 end
 open Errors
@@ -521,12 +530,14 @@ and transpile_lambda l (input_type , output_type) =
   ok @@ Combinators.Expression.make_tpl (closure , tv)
 
 and transpile_recursive {fun_name; fun_type; lambda} =
-  let rec map_lambda : AST.expression_variable -> type_value -> AST.expression -> expression result = fun fun_name loop_type e ->
+  let rec map_lambda : AST.expression_variable -> type_value -> AST.expression -> (expression * expression_variable list) result = fun fun_name loop_type e ->
     match e.expression_content with 
       E_lambda {binder;result} -> 
-        let%bind body = map_lambda fun_name loop_type result in
-        ok @@ Expression.make (E_closure {binder;body}) loop_type|
-      _  -> replace_callback fun_name loop_type e
+        let%bind (body,l) = map_lambda fun_name loop_type result in
+        ok @@ (Expression.make (E_closure {binder;body}) loop_type, binder::l)
+      | _  -> 
+        let%bind res = replace_callback fun_name loop_type e in
+        ok @@ (res, [])
 
   and replace_callback : AST.expression_variable -> type_value -> AST.expression -> expression result = fun fun_name loop_type e ->
     match e.expression_content with
@@ -629,10 +640,13 @@ and transpile_recursive {fun_name; fun_type; lambda} =
   let%bind fun_type = transpile_type fun_type in
   let%bind (input_type,output_type) = get_t_function fun_type in
   let loop_type = t_union (None, input_type) (None, output_type) in
-  let%bind body = map_lambda fun_name loop_type lambda.result in
-  let expr = Expression.make_tpl (E_variable fun_name, input_type) in
+  let%bind (body,binder) = map_lambda fun_name loop_type lambda.result in
+  let binder = lambda.binder::binder in
+  List.iter (Format.printf "inder %a\n%!" Var.pp) binder ;
+  let%bind binder = match binder with hd::[] -> ok @@ hd | _ -> fail @@ unsupported_recursive_function fun_name in
+  let expr = Expression.make_tpl (E_variable binder, input_type) in
   let body = Expression.make (E_iterator (C_LOOP_LEFT, ((lambda.binder, loop_type),body), expr)) output_type in
-  ok @@ Expression.make (E_closure {binder=fun_name;body}) fun_type
+  ok @@ Expression.make (E_closure {binder;body}) fun_type
 
 let transpile_declaration env (d:AST.declaration) : toplevel_statement result =
   match d with
diff --git a/src/stages/ast_typed/combinators.ml b/src/stages/ast_typed/combinators.ml
index 0a54bc708..d6f1e8da5 100644
--- a/src/stages/ast_typed/combinators.ml
+++ b/src/stages/ast_typed/combinators.ml
@@ -168,6 +168,17 @@ let get_t_function (t:type_expression) : (type_expression * type_expression) res
   | T_arrow {type1;type2} -> ok (type1,type2)
   | _ -> simple_fail "not a function"
 
+let get_t_function_full (t:type_expression) : (type_expression * type_expression) result =
+  let%bind _ = get_t_function t in
+  let rec aux n t = match t.type_content with 
+    | T_arrow {type1;type2} -> 
+      let (l, o) = aux (n+1) type2 in
+      ((Label (string_of_int n),type1)::l,o)
+    | _ -> ([],t)
+  in
+  let (input,output) = aux 0 t in
+  ok @@ (t_record (LMap.of_list input) (),output) 
+
 let get_t_sum (t:type_expression) : type_expression constructor_map result = match t.type_content with
   | T_sum m -> ok m
   | _ -> fail @@ Errors.not_a_x_type "sum" t ()
diff --git a/src/stages/ast_typed/combinators.mli b/src/stages/ast_typed/combinators.mli
index 1b3f31aea..a42abd3cc 100644
--- a/src/stages/ast_typed/combinators.mli
+++ b/src/stages/ast_typed/combinators.mli
@@ -62,6 +62,7 @@ val get_t_key_hash : type_expression -> unit result
 val get_t_tuple : type_expression -> type_expression list result
 val get_t_pair : type_expression -> ( type_expression * type_expression ) result
 val get_t_function : type_expression -> ( type_expression * type_expression ) result
+val get_t_function_full : type_expression -> ( type_expression * type_expression ) result
 val get_t_sum : type_expression -> type_expression constructor_map result
 val get_t_record : type_expression -> type_expression label_map result
 val get_t_map : type_expression -> ( type_expression * type_expression ) result
diff --git a/src/test/contracts/loop.mligo b/src/test/contracts/loop.mligo
index 82da7268e..1333cf66a 100644
--- a/src/test/contracts/loop.mligo
+++ b/src/test/contracts/loop.mligo
@@ -1,10 +1,9 @@
 (* Test functional iterators in CameLIGO *)
 
-let aux_simple (i : int) : bool * int =
-  if i < 100 then Loop.resume (i + 1) else Loop.stop i
+let rec aux_simple (i : int) : int =
+  if i < 100 then aux_simple (i + 1) else i
 
-let counter_simple (n : int) : int =
-  Loop.fold_while aux_simple n
+let counter_simple (n : int) : int = aux_simple n
 
 type sum_aggregator = {
   counter : int;
@@ -13,25 +12,23 @@ type sum_aggregator = {
 
 let counter (n : int) : int =
   let initial : sum_aggregator = {counter=0; sum=0} in
-  let aggregate = fun (prev : sum_aggregator) ->
+  let rec aggregate : sum_aggregator -> int = fun (prev: sum_aggregator) ->
     if prev.counter <= n then
-      Loop.resume {counter = prev.counter + 1;
+      aggregate {counter = prev.counter + 1;
                    sum = prev.counter + prev.sum}
     else
-      Loop.stop {counter = prev.counter; sum = prev.sum} in
-  let out : sum_aggregator =
-    Loop.fold_while aggregate initial
-  in out.sum
+      prev.sum 
+  in
+  aggregate initial
 
-let aux_nest (prev : sum_aggregator) : bool * sum_aggregator =
+let rec aux_nest (prev : sum_aggregator) : int =
   if prev.counter < 100 then
-    let sum : int =
-      prev.sum + Loop.fold_while aux_simple prev.counter
-    in Loop.resume {counter = prev.counter + 1; sum = sum}
+    let sum = prev.sum + (aux_simple prev.counter) in
+    aux_nest {counter = prev.counter + 1; sum = sum}
   else
-    Loop.stop {counter = prev.counter; sum = prev.sum}
+    prev.sum
 
 let counter_nest (n : int) : int =
   let initial : sum_aggregator = {counter=0; sum=0} in
-  let out : sum_aggregator = Loop.fold_while aux_nest initial
-  in out.sum
+  let out = aux_nest initial
+  in out
diff --git a/src/test/contracts/loop.religo b/src/test/contracts/loop.religo
index a1d8b6e44..010542d1d 100644
--- a/src/test/contracts/loop.religo
+++ b/src/test/contracts/loop.religo
@@ -1,9 +1,9 @@
 /* Test loops in ReasonLIGO */
 
-let aux_simple = (i : int) : (bool, int) =>
-  if (i < 100) { Loop.resume (i + 1); } else { Loop.stop (i); };
+let rec aux_simple = (i : int) : int =>
+  if (i < 100) { aux_simple (i + 1); } else { i; };
 
-let counter_simple = (n : int) : int => Loop.fold_while (aux_simple, n);
+let counter_simple = (n : int) : int => aux_simple (n);
 
 type sum_aggregator = {
   counter : int,
@@ -12,30 +12,28 @@ type sum_aggregator = {
 
 let counter = (n : int) : int => {
   let initial : sum_aggregator = {counter: 0, sum: 0};
-  let aggregate = (prev : sum_aggregator) =>
+  let rec aggregate = (prev : sum_aggregator):int =>
     if (prev.counter <= n) {
-      Loop.resume ({counter : prev.counter + 1,
+      aggregate ({counter : prev.counter + 1,
                     sum : prev.counter + prev.sum});
     } else {
-      Loop.stop ({counter: prev.counter, sum: prev.sum});
+      prev.sum;
     };
-  let out : sum_aggregator =
-    Loop.fold_while (aggregate, initial);
-  out.sum;
+  aggregate (initial);
 };
 
-let aux_nest = (prev : sum_aggregator) : (bool, sum_aggregator) =>
+let rec aux_nest = (prev : sum_aggregator) : sum_aggregator =>
   if (prev.counter < 100) {
     let sum : int =
-      prev.sum + Loop.fold_while (aux_simple, prev.counter);
-    Loop.resume ({counter: prev.counter + 1,
+      prev.sum + aux_simple (prev.counter);
+    aux_nest ({counter: prev.counter + 1,
                   sum: sum});
   } else {
-    Loop.stop ({counter: prev.counter, sum: prev.sum});
+    ({counter: prev.counter, sum: prev.sum});
   };
 
 let counter_nest = (n : int) : int => {
   let initial : sum_aggregator = {counter: 0, sum: 0};
-  let out : sum_aggregator = Loop.fold_while (aux_nest, initial);
+  let out : sum_aggregator = aux_nest (initial);
   out.sum;
 };

From 27f583266ee59795c628a8713da62e965c7d8df5 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 9 Mar 2020 11:26:13 +0100
Subject: [PATCH 17/43] test for tail recursion

---
 src/bin/expect_tests/contract_tests.ml        |   4 +-
 src/bin/expect_tests/typer_error_tests.ml     |  13 +++
 src/main/compile/dune                         |   2 +-
 src/main/compile/of_simplified.ml             |   9 +-
 src/passes/5-self_ast_typed/helpers.ml        |  21 +++-
 src/passes/5-self_ast_typed/main.ml           |   0
 src/passes/5-self_ast_typed/self_ast_typed.ml |  13 ++-
 src/passes/5-self_ast_typed/tail_recursion.ml | 108 ++++++++++++++++++
 .../error_no_tail_recursive_function.mligo    |   3 +
 9 files changed, 159 insertions(+), 14 deletions(-)
 create mode 100644 src/passes/5-self_ast_typed/main.ml
 create mode 100644 src/passes/5-self_ast_typed/tail_recursion.ml
 create mode 100644 src/test/contracts/negative/error_no_tail_recursive_function.mligo

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 1bb5d7969..de2524afe 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#808 = #P in let p = rhs#808.0 in let s = rhs#808.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#809 = #P in let p = rhs#809.0 in let s = rhs#809.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#812 = #P in let p = rhs#812.0 in let s = rhs#812.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
diff --git a/src/bin/expect_tests/typer_error_tests.ml b/src/bin/expect_tests/typer_error_tests.ml
index 48d53bcbd..b28509e3f 100644
--- a/src/bin/expect_tests/typer_error_tests.ml
+++ b/src/bin/expect_tests/typer_error_tests.ml
@@ -32,6 +32,19 @@ let%expect_test _ =
     ligo: in file "", line 0, characters 0-0. different kinds:  {"a":"( (TO_list(operation)) * sum[Add -> int , Sub -> int] )","b":"sum[Add -> int , Sub -> int]"}
 
 
+     If you're not sure how to fix this error, you can
+     do one of the following:
+
+    * Visit our documentation: https://ligolang.org/docs/intro/what-and-why/
+    * Ask a question on our Discord: https://discord.gg/9rhYaEt
+    * Open a gitlab issue: https://gitlab.com/ligolang/ligo/issues/new
+    * Check the changelog by running 'ligo changelog' |}];
+
+  run_ligo_bad [ "compile-contract" ; "../../test/contracts/negative/error_no_tail_recursive_function.mligo"; "f"];
+  [%expect {|
+    ligo: in file "error_no_tail_recursive_function.mligo", line 2, characters 14-21. Recursive call is only allowed as the last operation:  {"function":"unvalid","location":"in file \"error_no_tail_recursive_function.mligo\", line 2, characters 14-21"}
+
+
      If you're not sure how to fix this error, you can
      do one of the following:
 
diff --git a/src/main/compile/dune b/src/main/compile/dune
index 7629e3d2b..98ff34494 100644
--- a/src/main/compile/dune
+++ b/src/main/compile/dune
@@ -9,10 +9,10 @@
     interpreter
     ast_simplified
     self_ast_simplified
-    self_ast_typed
     typer_new
     typer
     ast_typed
+    self_ast_typed
     transpiler
     mini_c
     self_mini_c
diff --git a/src/main/compile/of_simplified.ml b/src/main/compile/of_simplified.ml
index 6a948e6d5..433321da4 100644
--- a/src/main/compile/of_simplified.ml
+++ b/src/main/compile/of_simplified.ml
@@ -7,10 +7,11 @@ type form =
 let compile (cform: form) (program : Ast_simplified.program) : (Ast_typed.program * Typer.Solver.state) result =
   let%bind (prog_typed , state) = Typer.type_program program in
   let () = Typer.Solver.discard_state state in
-  let%bind prog_typed' = match cform with
-    | Contract entrypoint -> Self_ast_typed.all_contract entrypoint prog_typed
-    | Env -> ok prog_typed in
-  ok @@ (prog_typed', state)
+  let%bind applied = Self_ast_typed.all_program prog_typed in
+  let%bind applied' = match cform with
+    | Contract entrypoint -> Self_ast_typed.all_contract entrypoint applied
+    | Env -> ok applied in
+  ok @@ (applied', state)
 
 let compile_expression ?(env = Ast_typed.Environment.full_empty) ~(state : Typer.Solver.state) (ae : Ast_simplified.expression)
     : (Ast_typed.expression * Typer.Solver.state) result =
diff --git a/src/passes/5-self_ast_typed/helpers.ml b/src/passes/5-self_ast_typed/helpers.ml
index 153093b06..818cdccf5 100644
--- a/src/passes/5-self_ast_typed/helpers.ml
+++ b/src/passes/5-self_ast_typed/helpers.ml
@@ -25,6 +25,7 @@ let rec fold_expression : 'a folder -> 'a -> expression -> 'a result = fun f ini
       ok res
     )
   | E_lambda { binder = _ ; result = e }
+  | E_recursive {lambda= {result=e}}
   | E_constructor {element=e} -> (
       let%bind res = self init' e in
       ok res
@@ -148,6 +149,10 @@ let rec map_expression : mapper -> expression -> expression result = fun f e ->
       let%bind result = self result in
       return @@ E_lambda { binder ; result }
     )
+  | E_recursive { fun_name; fun_type; lambda = {binder;result}} -> (
+      let%bind result = self result in
+      return @@ E_recursive { fun_name; fun_type; lambda = {binder;result}}
+    )
   | E_constant c -> (
       let%bind args = bind_map_list self c.arguments in
       return @@ E_constant {c with arguments=args}
@@ -172,9 +177,9 @@ and map_cases : mapper -> matching_expr -> matching_expr result = fun f m ->
       let%bind some = map_expression f some in
       ok @@ Match_option { match_none ; match_some = (name , some, te) }
     )
-  | Match_tuple ((names , e), _) -> (
+  | Match_tuple ((names , e), te) -> (
       let%bind e' = map_expression f e in
-      ok @@ Match_tuple ((names , e'), [])
+      ok @@ Match_tuple ((names , e'), te)
     )
   | Match_variant (lst, te) -> (
       let aux ((a , b) , e) =
@@ -188,9 +193,9 @@ and map_cases : mapper -> matching_expr -> matching_expr result = fun f m ->
 and map_program : mapper -> program -> program result = fun m p ->
   let aux = fun (x : declaration) ->
     match x with
-    | Declaration_constant (v , e , i, env) -> (
+    | Declaration_constant (n , e , i, env) -> (
         let%bind e' = map_expression m e in
-        ok (Declaration_constant (v , e' , i, env))
+        ok (Declaration_constant (n , e' , i, env))
       )
   in
   bind_map_list (bind_map_location aux) p
@@ -260,6 +265,10 @@ let rec fold_map_expression : 'a fold_mapper -> 'a -> expression -> ('a * expres
       let%bind (res,result) = self init' result in
       ok ( res, return @@ E_lambda { binder ; result })
     )
+  | E_recursive { fun_name; fun_type; lambda={binder;result}} -> (
+      let%bind (res,result) = self init' result in
+      ok (res, return @@ E_recursive {fun_name; fun_type; lambda={binder;result}})
+    )
   | E_constant c -> (
       let%bind (res,args) = bind_fold_map_list self init' c.arguments in
       ok (res, return @@ E_constant {c with arguments=args})
@@ -283,9 +292,9 @@ and fold_map_cases : 'a fold_mapper -> 'a -> matching_expr -> ('a * matching_exp
       let%bind (init, some) = fold_map_expression f init some in
       ok @@ (init, Match_option { match_none ; match_some = (name , some, te) })
     )
-  | Match_tuple ((names , e), _) -> (
+  | Match_tuple ((names , e), te) -> (
       let%bind (init, e') = fold_map_expression f init e in
-      ok @@ (init, Match_tuple ((names , e'), []))
+      ok @@ (init, Match_tuple ((names , e'), te))
     )
   | Match_variant (lst, te) -> (
       let aux init ((a , b) , e) =
diff --git a/src/passes/5-self_ast_typed/main.ml b/src/passes/5-self_ast_typed/main.ml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/passes/5-self_ast_typed/self_ast_typed.ml b/src/passes/5-self_ast_typed/self_ast_typed.ml
index 165a1825f..76bfbdf90 100644
--- a/src/passes/5-self_ast_typed/self_ast_typed.ml
+++ b/src/passes/5-self_ast_typed/self_ast_typed.ml
@@ -1,6 +1,8 @@
 open Trace
 
-let all_passes = []
+let all_passes = [
+  Tail_recursion.peephole_expression
+]
 
 let contract_passes = [
   Contract_passes.self_typing ;
@@ -22,3 +24,12 @@ let all_contract main_name prg =
     } in
   let all_p = List.map (fun pass -> Helpers.fold_map_program pass data) contract_passes in
   bind_chain_ignore_acc all_p prg
+let all = [
+  Tail_recursion.peephole_expression
+]
+
+let map_expression = Helpers.map_expression
+
+let fold_expression = Helpers.fold_expression
+
+let fold_map_expression = Helpers.fold_map_expression
diff --git a/src/passes/5-self_ast_typed/tail_recursion.ml b/src/passes/5-self_ast_typed/tail_recursion.ml
new file mode 100644
index 000000000..5d22d6104
--- /dev/null
+++ b/src/passes/5-self_ast_typed/tail_recursion.ml
@@ -0,0 +1,108 @@
+open Ast_typed
+open Trace
+
+module Errors = struct
+  let recursive_call_is_only_allowed_as_the_last_operation name loc () =
+    let title = (thunk ("Recursive call is only allowed as the last operation")) in
+    let message () = "" in
+    let data = [
+      ("function" , fun () -> Format.asprintf "%a" PP.expression_variable name);
+      ("location" , fun () -> Format.asprintf "%a" Location.pp loc)
+    ] in
+    error ~data title message ()
+end
+open Errors
+
+let rec check_recursive_call : expression_variable -> bool -> expression -> unit result = fun n final_path e ->
+  match e.expression_content with
+  | E_literal _   -> ok ()
+  | E_constant c  ->
+    let%bind _ = bind_map_list (check_recursive_call n false) c.arguments in
+    ok ()
+  | E_variable v  -> (
+    let%bind _ = trace_strong (recursive_call_is_only_allowed_as_the_last_operation n e.location) @@
+    Assert.assert_true (final_path || n <> v) in
+    ok ()
+    )
+  | E_application {expr1;expr2} ->
+    let%bind _ = check_recursive_call n final_path expr1 in
+    let%bind _ = check_recursive_call n false expr2 in
+    ok ()
+  | E_lambda {result;_} ->
+    let%bind _ = check_recursive_call n final_path result in
+    ok ()
+  | E_recursive { fun_name; lambda} ->
+    let%bind _ = check_recursive_call fun_name true lambda.result in
+    ok ()
+  | E_let_in {rhs;let_result;_} ->
+    let%bind _ = check_recursive_call n false rhs in
+    let%bind _ = check_recursive_call n final_path let_result in
+    ok ()
+  | E_constructor {element;_} ->
+    let%bind _ = check_recursive_call n false element in
+    ok ()
+  | E_matching {matchee;cases} ->
+    let%bind _ = check_recursive_call n false matchee in
+    let%bind _ = check_recursive_call_in_matching n final_path cases in
+    ok ()
+  | E_record elm -> 
+    let es = LMap.to_list elm in
+    let%bind _ = bind_map_list (check_recursive_call n false) es in
+    ok ()
+  | E_record_accessor {expr;_} ->
+    let%bind _ = check_recursive_call n false expr in
+    ok ()
+  | E_record_update {record;update;_} ->
+    let%bind _ = check_recursive_call n false record in
+    let%bind _ = check_recursive_call n false update in
+    ok ()
+  | E_map eel | E_big_map eel->
+    let aux (e1,e2) = 
+      let%bind _ = check_recursive_call n false e1 in
+      let%bind _ = check_recursive_call n false e2 in
+      ok ()
+    in
+    let%bind _ = bind_map_list aux eel in
+    ok ()
+  | E_list el | E_set el ->
+    let%bind _ = bind_map_list (check_recursive_call n false) el in
+    ok ()
+  | E_look_up (e1,e2) ->
+    let%bind _ = check_recursive_call n false e1 in
+    let%bind _ = check_recursive_call n false e2 in
+    ok ()
+
+and check_recursive_call_in_matching = fun n final_path c ->
+  match c with
+  | Match_bool {match_true;match_false} ->
+    let%bind _ = check_recursive_call n final_path match_true in
+    let%bind _ = check_recursive_call n final_path match_false in
+    ok ()
+  | Match_list {match_nil;match_cons=(_,_,e,_)} ->
+    let%bind _ = check_recursive_call n final_path match_nil in
+    let%bind _ = check_recursive_call n final_path e in
+    ok ()
+  | Match_option {match_none; match_some=(_,e,_)} ->
+    let%bind _ = check_recursive_call n final_path match_none in
+    let%bind _ = check_recursive_call n final_path e in
+    ok ()
+  | Match_tuple ((_,e),_) ->
+    let%bind _ = check_recursive_call n final_path e in
+    ok ()
+  | Match_variant (l,_) ->
+    let aux (_,e) =
+      let%bind _ = check_recursive_call n final_path e in
+      ok ()
+    in
+    let%bind _ = bind_map_list aux l in
+    ok ()
+    
+
+let peephole_expression : expression -> expression result = fun e ->
+  let return expression_content = ok { e with expression_content } in
+  match e.expression_content with
+  | E_recursive {fun_name; lambda} as e-> (
+    let%bind _ = check_recursive_call fun_name true lambda.result in
+    return e
+    )
+  | e -> return e
diff --git a/src/test/contracts/negative/error_no_tail_recursive_function.mligo b/src/test/contracts/negative/error_no_tail_recursive_function.mligo
new file mode 100644
index 000000000..9ea4d149f
--- /dev/null
+++ b/src/test/contracts/negative/error_no_tail_recursive_function.mligo
@@ -0,0 +1,3 @@
+let rec unvalid (n:int):int =
+    let res = unvalid (n) in
+    res + 1

From 092360de933119fbebe46ceb9952d93c6a6bba09 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 9 Mar 2020 17:32:57 +0100
Subject: [PATCH 18/43] WIP: fix parser error

---
 src/passes/1-parser/cameligo/Parser.mly       |    2 +-
 .../cameligo/error.messages.checked-in        | 1473 ++--
 src/passes/1-parser/pascaligo.ml              |    8 +-
 src/passes/1-parser/pascaligo/Parser.mly      |   19 +-
 .../pascaligo/error.messages.checked-in       | 6369 ++++++++---------
 .../reasonligo/error.messages.checked-in      |  319 +-
 src/test/parser_negative_tests.ml             |    9 +-
 7 files changed, 4275 insertions(+), 3924 deletions(-)

diff --git a/src/passes/1-parser/cameligo/Parser.mly b/src/passes/1-parser/cameligo/Parser.mly
index 5d166e916..38c62e50a 100644
--- a/src/passes/1-parser/cameligo/Parser.mly
+++ b/src/passes/1-parser/cameligo/Parser.mly
@@ -203,7 +203,7 @@ field_decl:
     and value  = {field_name=$1; colon=$2; field_type=$3}
     in {region; value} }
 
-(* Top-level non-recursive definitions *)
+(* Top-level non-eecursive definitions *)
 
 let_declaration:
   "let" ioption("rec") let_binding seq(Attr) {
diff --git a/src/passes/1-parser/cameligo/error.messages.checked-in b/src/passes/1-parser/cameligo/error.messages.checked-in
index d0cbf4a33..b81356f73 100644
--- a/src/passes/1-parser/cameligo/error.messages.checked-in
+++ b/src/passes/1-parser/cameligo/error.messages.checked-in
@@ -1,6 +1,6 @@
 interactive_expr: Begin True RBRACKET
 ##
-## Ends in an error in state: 214.
+## Ends in an error in state: 215.
 ##
 ## sequence -> Begin option(sep_or_term_list(expr,SEMI)) . End [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -11,28 +11,28 @@ interactive_expr: Begin True RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 239, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 217, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-## In state 213, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 240, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 218, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 214, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Begin With
 ##
-## Ends in an error in state: 197.
+## Ends in an error in state: 198.
 ##
 ## sequence -> Begin . option(sep_or_term_list(expr,SEMI)) End [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -44,7 +44,7 @@ interactive_expr: Begin With
 
 interactive_expr: C_None WILD
 ##
-## Ends in an error in state: 218.
+## Ends in an error in state: 219.
 ##
 ## add_expr_level -> mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -59,7 +59,7 @@ interactive_expr: C_None WILD
 
 interactive_expr: C_Some With
 ##
-## Ends in an error in state: 198.
+## Ends in an error in state: 199.
 ##
 ## constr_expr -> C_Some . core_expr [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -71,7 +71,7 @@ interactive_expr: C_Some With
 
 interactive_expr: Constr DOT Ident DOT With
 ##
-## Ends in an error in state: 193.
+## Ends in an error in state: 194.
 ##
 ## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -83,7 +83,7 @@ interactive_expr: Constr DOT Ident DOT With
 
 interactive_expr: Constr DOT Ident WILD
 ##
-## Ends in an error in state: 192.
+## Ends in an error in state: 193.
 ##
 ## module_field -> Constr DOT Ident . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -96,7 +96,7 @@ interactive_expr: Constr DOT Ident WILD
 
 interactive_expr: Constr DOT With
 ##
-## Ends in an error in state: 191.
+## Ends in an error in state: 192.
 ##
 ## module_field -> Constr DOT . Ident [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -109,7 +109,7 @@ interactive_expr: Constr DOT With
 
 interactive_expr: Constr WILD
 ##
-## Ends in an error in state: 190.
+## Ends in an error in state: 191.
 ##
 ## constr_expr -> Constr . core_expr [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## constr_expr -> Constr . [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -124,7 +124,7 @@ interactive_expr: Constr WILD
 
 interactive_expr: Fun WILD ARROW With
 ##
-## Ends in an error in state: 188.
+## Ends in an error in state: 189.
 ##
 ## fun_expr(expr) -> Fun nseq(irrefutable) ARROW . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -136,7 +136,7 @@ interactive_expr: Fun WILD ARROW With
 
 interactive_expr: Fun WILD RPAR
 ##
-## Ends in an error in state: 304.
+## Ends in an error in state: 305.
 ##
 ## nseq(irrefutable) -> irrefutable . seq(irrefutable) [ ARROW ]
 ##
@@ -154,7 +154,7 @@ interactive_expr: Fun WILD RPAR
 
 interactive_expr: Fun WILD WILD RPAR
 ##
-## Ends in an error in state: 306.
+## Ends in an error in state: 307.
 ##
 ## seq(irrefutable) -> irrefutable . seq(irrefutable) [ ARROW ]
 ##
@@ -172,7 +172,7 @@ interactive_expr: Fun WILD WILD RPAR
 
 interactive_expr: Fun With
 ##
-## Ends in an error in state: 186.
+## Ends in an error in state: 187.
 ##
 ## fun_expr(expr) -> Fun . nseq(irrefutable) ARROW expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -184,7 +184,7 @@ interactive_expr: Fun With
 
 interactive_expr: Ident DOT Int DOT With
 ##
-## Ends in an error in state: 183.
+## Ends in an error in state: 184.
 ##
 ## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -196,7 +196,7 @@ interactive_expr: Ident DOT Int DOT With
 
 interactive_expr: Ident DOT Int WILD
 ##
-## Ends in an error in state: 182.
+## Ends in an error in state: 183.
 ##
 ## nsepseq(selection,DOT) -> selection . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -209,7 +209,7 @@ interactive_expr: Ident DOT Int WILD
 
 interactive_expr: Ident DOT With
 ##
-## Ends in an error in state: 179.
+## Ends in an error in state: 180.
 ##
 ## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -221,7 +221,7 @@ interactive_expr: Ident DOT With
 
 interactive_expr: Ident WILD
 ##
-## Ends in an error in state: 178.
+## Ends in an error in state: 179.
 ##
 ## core_expr -> Ident . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -234,7 +234,7 @@ interactive_expr: Ident WILD
 
 interactive_expr: If True Then Fun WILD ARROW With
 ##
-## Ends in an error in state: 410.
+## Ends in an error in state: 423.
 ##
 ## fun_expr(closed_if) -> Fun nseq(irrefutable) ARROW . closed_if [ Else ]
 ## fun_expr(expr) -> Fun nseq(irrefutable) ARROW . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -247,7 +247,7 @@ interactive_expr: If True Then Fun WILD ARROW With
 
 interactive_expr: If True Then Fun With
 ##
-## Ends in an error in state: 408.
+## Ends in an error in state: 421.
 ##
 ## fun_expr(closed_if) -> Fun . nseq(irrefutable) ARROW closed_if [ Else ]
 ## fun_expr(expr) -> Fun . nseq(irrefutable) ARROW expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -260,7 +260,7 @@ interactive_expr: If True Then Fun With
 
 interactive_expr: If True Then If True Then True Else With
 ##
-## Ends in an error in state: 415.
+## Ends in an error in state: 428.
 ##
 ## if_then_else(closed_if) -> If expr Then closed_if Else . closed_if [ Else ]
 ## if_then_else(expr) -> If expr Then closed_if Else . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -273,7 +273,7 @@ interactive_expr: If True Then If True Then True Else With
 
 interactive_expr: If True Then If True Then With
 ##
-## Ends in an error in state: 407.
+## Ends in an error in state: 420.
 ##
 ## if_then(expr) -> If expr Then . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr Then . closed_if Else closed_if [ Else ]
@@ -287,7 +287,7 @@ interactive_expr: If True Then If True Then With
 
 interactive_expr: If True Then If True With
 ##
-## Ends in an error in state: 406.
+## Ends in an error in state: 419.
 ##
 ## if_then(expr) -> If expr . Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr . Then closed_if Else closed_if [ Else ]
@@ -300,25 +300,25 @@ interactive_expr: If True Then If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then If With
 ##
-## Ends in an error in state: 405.
+## Ends in an error in state: 418.
 ##
 ## if_then(expr) -> If . expr Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If . expr Then closed_if Else closed_if [ Else ]
@@ -330,9 +330,86 @@ interactive_expr: If True Then If With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: If True Then Let Rec WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 416.
+##
+## let_expr(closed_if) -> Let Rec let_binding seq(Attr) . In closed_if [ Else ]
+## let_expr(expr) -> Let Rec let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Let Rec WILD EQ Bytes In With
+##
+## Ends in an error in state: 417.
+##
+## let_expr(closed_if) -> Let Rec let_binding seq(Attr) In . closed_if [ Else ]
+## let_expr(expr) -> Let Rec let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 415.
+##
+## let_expr(closed_if) -> Let Rec let_binding . seq(Attr) In closed_if [ Else ]
+## let_expr(expr) -> Let Rec let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Let Rec With
+##
+## Ends in an error in state: 414.
+##
+## let_expr(closed_if) -> Let Rec . let_binding seq(Attr) In closed_if [ Else ]
+## let_expr(expr) -> Let Rec . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: If True Then Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 403.
+## Ends in an error in state: 432.
 ##
 ## let_expr(closed_if) -> Let let_binding seq(Attr) . In closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -344,15 +421,15 @@ interactive_expr: If True Then Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 169, spurious reduction of production seq(Attr) -> 
-## In state 170, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 404.
+## Ends in an error in state: 433.
 ##
 ## let_expr(closed_if) -> Let let_binding seq(Attr) In . closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -365,7 +442,7 @@ interactive_expr: If True Then Let WILD EQ Bytes In With
 
 interactive_expr: If True Then Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 402.
+## Ends in an error in state: 431.
 ##
 ## let_expr(closed_if) -> Let let_binding . seq(Attr) In closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -377,29 +454,31 @@ interactive_expr: If True Then Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let With
 ##
-## Ends in an error in state: 401.
+## Ends in an error in state: 413.
 ##
 ## let_expr(closed_if) -> Let . let_binding seq(Attr) In closed_if [ Else ]
+## let_expr(closed_if) -> Let . Rec let_binding seq(Attr) In closed_if [ Else ]
 ## let_expr(expr) -> Let . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(expr) -> Let . Rec let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -409,7 +488,7 @@ interactive_expr: If True Then Let With
 
 interactive_expr: If True Then Match True Type
 ##
-## Ends in an error in state: 311.
+## Ends in an error in state: 312.
 ##
 ## match_expr(base_cond) -> Match expr . With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr . With option(VBAR) cases(base_if_then_else) [ Else ]
@@ -421,25 +500,25 @@ interactive_expr: If True Then Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With VBAR Begin
 ##
-## Ends in an error in state: 314.
+## Ends in an error in state: 315.
 ##
 ## match_expr(base_cond) -> Match expr With option(VBAR) . cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr With option(VBAR) . cases(base_if_then_else) [ Else ]
@@ -452,7 +531,7 @@ interactive_expr: If True Then Match True With VBAR Begin
 
 interactive_expr: If True Then Match True With WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 340.
+## Ends in an error in state: 342.
 ##
 ## cases(base_cond) -> cases(base_cond) VBAR . case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## cases(base_if_then_else) -> cases(base_cond) VBAR . case_clause(base_if_then_else) [ Else ]
@@ -465,7 +544,7 @@ interactive_expr: If True Then Match True With WILD ARROW Bytes VBAR With
 
 interactive_expr: If True Then Match True With WILD ARROW Fun WILD ARROW With
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 395.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(base_if_then_else) -> Fun nseq(irrefutable) ARROW . base_if_then_else [ Else ]
@@ -478,7 +557,7 @@ interactive_expr: If True Then Match True With WILD ARROW Fun WILD ARROW With
 
 interactive_expr: If True Then Match True With WILD ARROW Fun With
 ##
-## Ends in an error in state: 385.
+## Ends in an error in state: 393.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(base_if_then_else) -> Fun . nseq(irrefutable) ARROW base_if_then_else [ Else ]
@@ -491,7 +570,7 @@ interactive_expr: If True Then Match True With WILD ARROW Fun With
 
 interactive_expr: If True Then Match True With WILD ARROW If True Then True Else With
 ##
-## Ends in an error in state: 384.
+## Ends in an error in state: 392.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_if_then_else) -> If expr Then closed_if Else . base_if_then_else [ Else ]
@@ -504,7 +583,7 @@ interactive_expr: If True Then Match True With WILD ARROW If True Then True Else
 
 interactive_expr: If True Then Match True With WILD ARROW If True Then With
 ##
-## Ends in an error in state: 332.
+## Ends in an error in state: 334.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -518,7 +597,7 @@ interactive_expr: If True Then Match True With WILD ARROW If True Then With
 
 interactive_expr: If True Then Match True With WILD ARROW If True With
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 333.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -531,25 +610,25 @@ interactive_expr: If True Then Match True With WILD ARROW If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW If With
 ##
-## Ends in an error in state: 330.
+## Ends in an error in state: 332.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -561,10 +640,87 @@ interactive_expr: If True Then Match True With WILD ARROW If With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes Attr Type
+interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 330.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_if_then_else) -> Let Rec let_binding seq(Attr) . In base_if_then_else [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes In With
+##
+## Ends in an error in state: 331.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_if_then_else) -> Let Rec let_binding seq(Attr) In . base_if_then_else [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 329.
+##
+## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_if_then_else) -> Let Rec let_binding . seq(Attr) In base_if_then_else [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Match True With WILD ARROW Let Rec With
 ##
 ## Ends in an error in state: 328.
 ##
+## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_if_then_else) -> Let Rec . let_binding seq(Attr) In base_if_then_else [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 407.
+##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding seq(Attr) . In base_if_then_else [ Else ]
 ##
@@ -575,15 +731,15 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes Attr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 169, spurious reduction of production seq(Attr) -> 
-## In state 170, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 329.
+## Ends in an error in state: 408.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding seq(Attr) In . base_if_then_else [ Else ]
@@ -596,7 +752,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes In W
 
 interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 327.
+## Ends in an error in state: 406.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding . seq(Attr) In base_if_then_else [ Else ]
@@ -608,29 +764,31 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let With
 ##
-## Ends in an error in state: 326.
+## Ends in an error in state: 327.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let . let_binding seq(Attr) In base_if_then_else [ Else ]
+## let_expr(base_if_then_else) -> Let . Rec let_binding seq(Attr) In base_if_then_else [ Else ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -640,7 +798,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let With
 
 interactive_expr: If True Then Match True With WILD ARROW With
 ##
-## Ends in an error in state: 325.
+## Ends in an error in state: 326.
 ##
 ## case_clause(base_cond) -> pattern ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## case_clause(base_if_then_else) -> pattern ARROW . base_if_then_else [ Else ]
@@ -653,7 +811,7 @@ interactive_expr: If True Then Match True With WILD ARROW With
 
 interactive_expr: If True Then Match True With WILD CONS Bytes SEMI
 ##
-## Ends in an error in state: 324.
+## Ends in an error in state: 325.
 ##
 ## case_clause(base_cond) -> pattern . ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## case_clause(base_if_then_else) -> pattern . ARROW base_if_then_else [ Else ]
@@ -666,14 +824,14 @@ interactive_expr: If True Then Match True With WILD CONS Bytes SEMI
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
 ## In state 94, spurious reduction of production tail -> sub_pattern 
-## In state 318, spurious reduction of production pattern -> sub_pattern CONS tail 
+## In state 319, spurious reduction of production pattern -> sub_pattern CONS tail 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With With
 ##
-## Ends in an error in state: 312.
+## Ends in an error in state: 313.
 ##
 ## match_expr(base_cond) -> Match expr With . option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr With . option(VBAR) cases(base_if_then_else) [ Else ]
@@ -686,7 +844,7 @@ interactive_expr: If True Then Match True With With
 
 interactive_expr: If True Then Match With
 ##
-## Ends in an error in state: 310.
+## Ends in an error in state: 311.
 ##
 ## match_expr(base_cond) -> Match . expr With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match . expr With option(VBAR) cases(base_if_then_else) [ Else ]
@@ -699,7 +857,7 @@ interactive_expr: If True Then Match With
 
 interactive_expr: If True Then True COMMA Bytes VBAR
 ##
-## Ends in an error in state: 411.
+## Ends in an error in state: 424.
 ##
 ## base_expr(closed_if) -> tuple_expr . [ Else ]
 ## base_expr(expr) -> tuple_expr . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -711,25 +869,25 @@ interactive_expr: If True Then True COMMA Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 291, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
-## In state 290, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
-## In state 212, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 292, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
+## In state 291, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
+## In state 213, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then True Else With
 ##
-## Ends in an error in state: 419.
+## Ends in an error in state: 436.
 ##
 ## if_then_else(expr) -> If expr Then closed_if Else . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -741,7 +899,7 @@ interactive_expr: If True Then True Else With
 
 interactive_expr: If True Then True VBAR
 ##
-## Ends in an error in state: 412.
+## Ends in an error in state: 425.
 ##
 ## base_expr(closed_if) -> disj_expr_level . [ Else ]
 ## base_expr(expr) -> disj_expr_level . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -756,22 +914,22 @@ interactive_expr: If True Then True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then With
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 310.
 ##
 ## if_then(expr) -> If expr Then . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If expr Then . closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -784,7 +942,7 @@ interactive_expr: If True Then With
 
 interactive_expr: If True With
 ##
-## Ends in an error in state: 308.
+## Ends in an error in state: 309.
 ##
 ## if_then(expr) -> If expr . Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If expr . Then closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -796,25 +954,25 @@ interactive_expr: If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If With
 ##
-## Ends in an error in state: 177.
+## Ends in an error in state: 178.
 ##
 ## if_then(expr) -> If . expr Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If . expr Then closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -827,7 +985,7 @@ interactive_expr: If With
 
 interactive_expr: LBRACE Constr DOT Ident With
 ##
-## Ends in an error in state: 423.
+## Ends in an error in state: 440.
 ##
 ## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -839,7 +997,7 @@ interactive_expr: LBRACE Constr DOT Ident With
 
 interactive_expr: LBRACE Constr DOT With
 ##
-## Ends in an error in state: 422.
+## Ends in an error in state: 439.
 ##
 ## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -851,7 +1009,7 @@ interactive_expr: LBRACE Constr DOT With
 
 interactive_expr: LBRACE Constr With
 ##
-## Ends in an error in state: 421.
+## Ends in an error in state: 438.
 ##
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -863,7 +1021,7 @@ interactive_expr: LBRACE Constr With
 
 interactive_expr: LBRACE Ident DOT Ident VBAR
 ##
-## Ends in an error in state: 427.
+## Ends in an error in state: 444.
 ##
 ## update_record -> LBRACE path . With sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -874,16 +1032,16 @@ interactive_expr: LBRACE Ident DOT Ident VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 182, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 185, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
-## In state 426, spurious reduction of production path -> projection 
+## In state 183, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 186, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 443, spurious reduction of production path -> projection 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 454.
+## Ends in an error in state: 471.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACE ]
@@ -896,7 +1054,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 ##
-## Ends in an error in state: 453.
+## Ends in an error in state: 470.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACE ]
@@ -909,26 +1067,26 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 420, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 437, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident With
 ##
-## Ends in an error in state: 450.
+## Ends in an error in state: 467.
 ##
 ## field_assignment -> Ident . EQ expr [ SEMI RBRACE ]
 ##
@@ -940,7 +1098,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident With
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 449.
+## Ends in an error in state: 466.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACE ]
@@ -953,7 +1111,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident EQ Bytes With
 ##
-## Ends in an error in state: 448.
+## Ends in an error in state: 465.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACE ]
@@ -966,26 +1124,26 @@ interactive_expr: LBRACE Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 420, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 437, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ With
 ##
-## Ends in an error in state: 175.
+## Ends in an error in state: 176.
 ##
 ## field_assignment -> Ident EQ . expr [ SEMI RBRACE ]
 ##
@@ -997,7 +1155,7 @@ interactive_expr: LBRACE Ident EQ With
 
 interactive_expr: LBRACE Ident WILD
 ##
-## Ends in an error in state: 174.
+## Ends in an error in state: 175.
 ##
 ## field_assignment -> Ident . EQ expr [ SEMI RBRACE ]
 ## path -> Ident . [ With ]
@@ -1011,7 +1169,7 @@ interactive_expr: LBRACE Ident WILD
 
 interactive_expr: LBRACE Ident With Ident DOT With
 ##
-## Ends in an error in state: 430.
+## Ends in an error in state: 447.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ EQ ]
 ##
@@ -1023,7 +1181,7 @@ interactive_expr: LBRACE Ident With Ident DOT With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 444.
+## Ends in an error in state: 461.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACE ]
@@ -1036,7 +1194,7 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes With
 ##
-## Ends in an error in state: 443.
+## Ends in an error in state: 460.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACE ]
@@ -1049,26 +1207,26 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 438, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 455, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 440.
+## Ends in an error in state: 457.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACE ]
@@ -1081,7 +1239,7 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes With
 ##
-## Ends in an error in state: 439.
+## Ends in an error in state: 456.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACE ]
@@ -1094,26 +1252,26 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 438, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 455, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident With Ident EQ With
 ##
-## Ends in an error in state: 437.
+## Ends in an error in state: 454.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) EQ . expr [ SEMI RBRACE ]
 ##
@@ -1125,7 +1283,7 @@ interactive_expr: LBRACE Ident With Ident EQ With
 
 interactive_expr: LBRACE Ident With Ident With
 ##
-## Ends in an error in state: 429.
+## Ends in an error in state: 446.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ EQ ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ EQ ]
@@ -1138,7 +1296,7 @@ interactive_expr: LBRACE Ident With Ident With
 
 interactive_expr: LBRACE Ident With With
 ##
-## Ends in an error in state: 428.
+## Ends in an error in state: 445.
 ##
 ## update_record -> LBRACE path With . sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1150,7 +1308,7 @@ interactive_expr: LBRACE Ident With With
 
 interactive_expr: LBRACE With
 ##
-## Ends in an error in state: 173.
+## Ends in an error in state: 174.
 ##
 ## record_expr -> LBRACE . sep_or_term_list(field_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## update_record -> LBRACE . path With sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -1163,7 +1321,7 @@ interactive_expr: LBRACE With
 
 interactive_expr: LBRACKET True End
 ##
-## Ends in an error in state: 456.
+## Ends in an error in state: 476.
 ##
 ## list__(expr) -> LBRACKET option(sep_or_term_list(expr,SEMI)) . RBRACKET [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1174,28 +1332,28 @@ interactive_expr: LBRACKET True End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 239, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 217, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-## In state 213, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 240, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 218, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 214, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True SEMI True SEMI With
 ##
-## Ends in an error in state: 244.
+## Ends in an error in state: 245.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -1208,7 +1366,7 @@ interactive_expr: LBRACKET True SEMI True SEMI With
 
 interactive_expr: LBRACKET True SEMI True With
 ##
-## Ends in an error in state: 243.
+## Ends in an error in state: 244.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -1221,25 +1379,25 @@ interactive_expr: LBRACKET True SEMI True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True SEMI With
 ##
-## Ends in an error in state: 240.
+## Ends in an error in state: 241.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -1252,7 +1410,7 @@ interactive_expr: LBRACKET True SEMI With
 
 interactive_expr: LBRACKET True With
 ##
-## Ends in an error in state: 239.
+## Ends in an error in state: 240.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -1265,18 +1423,18 @@ interactive_expr: LBRACKET True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1295,7 +1453,7 @@ interactive_expr: LBRACKET With
 
 interactive_expr: LPAR True COLON Ident VBAR
 ##
-## Ends in an error in state: 483.
+## Ends in an error in state: 507.
 ##
 ## par(__anonymous_1) -> LPAR expr COLON type_expr . RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1315,7 +1473,7 @@ interactive_expr: LPAR True COLON Ident VBAR
 
 interactive_expr: LPAR True COLON With
 ##
-## Ends in an error in state: 482.
+## Ends in an error in state: 506.
 ##
 ## par(__anonymous_1) -> LPAR expr COLON . type_expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1327,7 +1485,7 @@ interactive_expr: LPAR True COLON With
 
 interactive_expr: LPAR True With
 ##
-## Ends in an error in state: 480.
+## Ends in an error in state: 504.
 ##
 ## par(__anonymous_1) -> LPAR expr . COLON type_expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## par(expr) -> LPAR expr . RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -1339,18 +1497,18 @@ interactive_expr: LPAR True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1369,9 +1527,82 @@ interactive_expr: LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Let Rec WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 172.
+##
+## let_expr(expr) -> Let Rec let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Let Rec WILD EQ Bytes In With
+##
+## Ends in an error in state: 173.
+##
+## let_expr(expr) -> Let Rec let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 169.
+##
+## let_expr(expr) -> Let Rec let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Let Rec With
+##
+## Ends in an error in state: 168.
+##
+## let_expr(expr) -> Let Rec . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 171.
+## Ends in an error in state: 474.
 ##
 ## let_expr(expr) -> Let let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1382,15 +1613,15 @@ interactive_expr: Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 169, spurious reduction of production seq(Attr) -> 
-## In state 170, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 172.
+## Ends in an error in state: 475.
 ##
 ## let_expr(expr) -> Let let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1402,7 +1633,7 @@ interactive_expr: Let WILD EQ Bytes In With
 
 interactive_expr: Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 168.
+## Ends in an error in state: 473.
 ##
 ## let_expr(expr) -> Let let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1413,19 +1644,19 @@ interactive_expr: Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1435,6 +1666,7 @@ interactive_expr: Let With
 ## Ends in an error in state: 167.
 ##
 ## let_expr(expr) -> Let . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(expr) -> Let . Rec let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -1456,7 +1688,7 @@ interactive_expr: MINUS With
 
 interactive_expr: Match True Type
 ##
-## Ends in an error in state: 459.
+## Ends in an error in state: 479.
 ##
 ## match_expr(base_cond) -> Match expr . With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1467,25 +1699,25 @@ interactive_expr: Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With LPAR Bytes RPAR With
 ##
-## Ends in an error in state: 316.
+## Ends in an error in state: 317.
 ##
 ## pattern -> sub_pattern . CONS tail [ ARROW ]
 ## tuple(sub_pattern) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ ARROW ]
@@ -1498,7 +1730,7 @@ interactive_expr: Match True With LPAR Bytes RPAR With
 
 interactive_expr: Match True With VBAR Begin
 ##
-## Ends in an error in state: 461.
+## Ends in an error in state: 481.
 ##
 ## match_expr(base_cond) -> Match expr With option(VBAR) . cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1510,7 +1742,7 @@ interactive_expr: Match True With VBAR Begin
 
 interactive_expr: Match True With WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 479.
+## Ends in an error in state: 503.
 ##
 ## cases(base_cond) -> cases(base_cond) VBAR . case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1522,7 +1754,7 @@ interactive_expr: Match True With WILD ARROW Bytes VBAR With
 
 interactive_expr: Match True With WILD ARROW Fun WILD ARROW With
 ##
-## Ends in an error in state: 475.
+## Ends in an error in state: 496.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1534,7 +1766,7 @@ interactive_expr: Match True With WILD ARROW Fun WILD ARROW With
 
 interactive_expr: Match True With WILD ARROW Fun With
 ##
-## Ends in an error in state: 473.
+## Ends in an error in state: 494.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1546,7 +1778,7 @@ interactive_expr: Match True With WILD ARROW Fun With
 
 interactive_expr: Match True With WILD ARROW If True Then Fun WILD ARROW With
 ##
-## Ends in an error in state: 354.
+## Ends in an error in state: 357.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(closed_if) -> Fun nseq(irrefutable) ARROW . closed_if [ Else ]
@@ -1559,7 +1791,7 @@ interactive_expr: Match True With WILD ARROW If True Then Fun WILD ARROW With
 
 interactive_expr: Match True With WILD ARROW If True Then Fun With
 ##
-## Ends in an error in state: 352.
+## Ends in an error in state: 355.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(closed_if) -> Fun . nseq(irrefutable) ARROW closed_if [ Else ]
@@ -1572,7 +1804,7 @@ interactive_expr: Match True With WILD ARROW If True Then Fun With
 
 interactive_expr: Match True With WILD ARROW If True Then If True Then True Else With
 ##
-## Ends in an error in state: 373.
+## Ends in an error in state: 376.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr Then closed_if Else . closed_if [ Else ]
@@ -1585,7 +1817,7 @@ interactive_expr: Match True With WILD ARROW If True Then If True Then True Else
 
 interactive_expr: Match True With WILD ARROW If True Then If True Then With
 ##
-## Ends in an error in state: 351.
+## Ends in an error in state: 354.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1599,7 +1831,7 @@ interactive_expr: Match True With WILD ARROW If True Then If True Then With
 
 interactive_expr: Match True With WILD ARROW If True Then If True With
 ##
-## Ends in an error in state: 350.
+## Ends in an error in state: 353.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1612,25 +1844,25 @@ interactive_expr: Match True With WILD ARROW If True Then If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then If With
 ##
-## Ends in an error in state: 349.
+## Ends in an error in state: 352.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1642,9 +1874,86 @@ interactive_expr: Match True With WILD ARROW If True Then If With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 350.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(closed_if) -> Let Rec let_binding seq(Attr) . In closed_if [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes In With
+##
+## Ends in an error in state: 351.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(closed_if) -> Let Rec let_binding seq(Attr) In . closed_if [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 349.
+##
+## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(closed_if) -> Let Rec let_binding . seq(Attr) In closed_if [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW If True Then Let Rec With
+##
+## Ends in an error in state: 348.
+##
+## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(closed_if) -> Let Rec . let_binding seq(Attr) In closed_if [ Else ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 347.
+## Ends in an error in state: 387.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding seq(Attr) . In closed_if [ Else ]
@@ -1656,15 +1965,15 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes Attr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 169, spurious reduction of production seq(Attr) -> 
-## In state 170, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 348.
+## Ends in an error in state: 388.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding seq(Attr) In . closed_if [ Else ]
@@ -1677,7 +1986,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes In W
 
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 346.
+## Ends in an error in state: 386.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding . seq(Attr) In closed_if [ Else ]
@@ -1689,29 +1998,31 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let With
 ##
-## Ends in an error in state: 345.
+## Ends in an error in state: 347.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let . let_binding seq(Attr) In closed_if [ Else ]
+## let_expr(closed_if) -> Let . Rec let_binding seq(Attr) In closed_if [ Else ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -1721,7 +2032,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let With
 
 interactive_expr: Match True With WILD ARROW If True Then Match True Type
 ##
-## Ends in an error in state: 334.
+## Ends in an error in state: 336.
 ##
 ## match_expr(base_if_then_else) -> Match expr . With option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -1732,25 +2043,25 @@ interactive_expr: Match True With WILD ARROW If True Then Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With VBAR Begin
 ##
-## Ends in an error in state: 336.
+## Ends in an error in state: 338.
 ##
 ## match_expr(base_if_then_else) -> Match expr With option(VBAR) . cases(base_if_then_else) [ Else ]
 ##
@@ -1762,7 +2073,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With VBAR B
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With WILD ARROW Bytes With
 ##
-## Ends in an error in state: 339.
+## Ends in an error in state: 341.
 ##
 ## cases(base_cond) -> cases(base_cond) . VBAR case_clause(base_cond) [ VBAR ]
 ## cases(base_if_then_else) -> cases(base_cond) . VBAR case_clause(base_if_then_else) [ Else ]
@@ -1774,27 +2085,27 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With WILD A
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 392, spurious reduction of production base_expr(base_cond) -> disj_expr_level 
-## In state 369, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 370, spurious reduction of production base_cond -> base_cond__open(base_cond) 
-## In state 399, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
-## In state 344, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 400, spurious reduction of production base_expr(base_cond) -> disj_expr_level 
+## In state 372, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 373, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 411, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
+## In state 346, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With With
 ##
-## Ends in an error in state: 335.
+## Ends in an error in state: 337.
 ##
 ## match_expr(base_if_then_else) -> Match expr With . option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -1806,7 +2117,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With With
 
 interactive_expr: Match True With WILD ARROW If True Then Match With
 ##
-## Ends in an error in state: 333.
+## Ends in an error in state: 335.
 ##
 ## match_expr(base_if_then_else) -> Match . expr With option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -1818,7 +2129,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match With
 
 interactive_expr: Match True With WILD ARROW If True Then True Else With
 ##
-## Ends in an error in state: 472.
+## Ends in an error in state: 493.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1830,7 +2141,7 @@ interactive_expr: Match True With WILD ARROW If True Then True Else With
 
 interactive_expr: Match True With WILD ARROW If True Then With
 ##
-## Ends in an error in state: 470.
+## Ends in an error in state: 491.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1843,7 +2154,7 @@ interactive_expr: Match True With WILD ARROW If True Then With
 
 interactive_expr: Match True With WILD ARROW If True With
 ##
-## Ends in an error in state: 469.
+## Ends in an error in state: 490.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1855,25 +2166,25 @@ interactive_expr: Match True With WILD ARROW If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If With
 ##
-## Ends in an error in state: 468.
+## Ends in an error in state: 489.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1884,9 +2195,82 @@ interactive_expr: Match True With WILD ARROW If With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes Attr Type
+##
+## Ends in an error in state: 487.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes In With
+##
+## Ends in an error in state: 488.
+##
+## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding seq(Attr) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 486.
+##
+## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Match True With WILD ARROW Let Rec With
+##
+## Ends in an error in state: 485.
+##
+## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 466.
+## Ends in an error in state: 500.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1897,15 +2281,15 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 169, spurious reduction of production seq(Attr) -> 
-## In state 170, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 170, spurious reduction of production seq(Attr) -> 
+## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 467.
+## Ends in an error in state: 501.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1917,7 +2301,7 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes In With
 
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 465.
+## Ends in an error in state: 499.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1928,28 +2312,29 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let With
 ##
-## Ends in an error in state: 464.
+## Ends in an error in state: 484.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
+## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -1959,7 +2344,7 @@ interactive_expr: Match True With WILD ARROW Let With
 
 interactive_expr: Match True With WILD ARROW True COMMA Bytes Else
 ##
-## Ends in an error in state: 478.
+## Ends in an error in state: 502.
 ##
 ## cases(base_cond) -> cases(base_cond) . VBAR case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_cond) -> Match expr With option(VBAR) cases(base_cond) . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1971,30 +2356,30 @@ interactive_expr: Match True With WILD ARROW True COMMA Bytes Else
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 291, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
-## In state 290, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
-## In state 212, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
-## In state 476, spurious reduction of production base_expr(base_cond) -> tuple_expr 
-## In state 369, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 370, spurious reduction of production base_cond -> base_cond__open(base_cond) 
-## In state 399, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
-## In state 344, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 292, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
+## In state 291, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
+## In state 213, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
+## In state 497, spurious reduction of production base_expr(base_cond) -> tuple_expr 
+## In state 372, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 373, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 411, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
+## In state 346, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW True Else
 ##
-## Ends in an error in state: 477.
+## Ends in an error in state: 498.
 ##
 ## base_expr(base_cond) -> disj_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End EOF COMMA COLON BOOL_OR Attr ]
@@ -2008,22 +2393,22 @@ interactive_expr: Match True With WILD ARROW True Else
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW With
 ##
-## Ends in an error in state: 463.
+## Ends in an error in state: 483.
 ##
 ## case_clause(base_cond) -> pattern ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2035,7 +2420,7 @@ interactive_expr: Match True With WILD ARROW With
 
 interactive_expr: Match True With WILD COMMA WILD COMMA With
 ##
-## Ends in an error in state: 321.
+## Ends in an error in state: 322.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ ARROW ]
 ##
@@ -2047,7 +2432,7 @@ interactive_expr: Match True With WILD COMMA WILD COMMA With
 
 interactive_expr: Match True With WILD COMMA WILD With
 ##
-## Ends in an error in state: 320.
+## Ends in an error in state: 321.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . [ ARROW ]
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ ARROW ]
@@ -2060,7 +2445,7 @@ interactive_expr: Match True With WILD COMMA WILD With
 
 interactive_expr: Match True With WILD COMMA With
 ##
-## Ends in an error in state: 319.
+## Ends in an error in state: 320.
 ##
 ## tuple(sub_pattern) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ ARROW ]
 ##
@@ -2072,7 +2457,7 @@ interactive_expr: Match True With WILD COMMA With
 
 interactive_expr: Match True With WILD CONS Bytes SEMI
 ##
-## Ends in an error in state: 462.
+## Ends in an error in state: 482.
 ##
 ## case_clause(base_cond) -> pattern . ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2084,14 +2469,14 @@ interactive_expr: Match True With WILD CONS Bytes SEMI
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
 ## In state 94, spurious reduction of production tail -> sub_pattern 
-## In state 318, spurious reduction of production pattern -> sub_pattern CONS tail 
+## In state 319, spurious reduction of production pattern -> sub_pattern CONS tail 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD CONS With
 ##
-## Ends in an error in state: 317.
+## Ends in an error in state: 318.
 ##
 ## pattern -> sub_pattern CONS . tail [ ARROW ]
 ##
@@ -2103,7 +2488,7 @@ interactive_expr: Match True With WILD CONS With
 
 interactive_expr: Match True With WILD With
 ##
-## Ends in an error in state: 337.
+## Ends in an error in state: 339.
 ##
 ## pattern -> core_pattern . [ ARROW ]
 ## sub_pattern -> core_pattern . [ CONS COMMA ]
@@ -2116,7 +2501,7 @@ interactive_expr: Match True With WILD With
 
 interactive_expr: Match True With With
 ##
-## Ends in an error in state: 460.
+## Ends in an error in state: 480.
 ##
 ## match_expr(base_cond) -> Match expr With . option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2152,7 +2537,7 @@ interactive_expr: Not With
 
 interactive_expr: True BOOL_AND With
 ##
-## Ends in an error in state: 266.
+## Ends in an error in state: 267.
 ##
 ## bin_op(conj_expr_level,BOOL_AND,comp_expr_level) -> conj_expr_level BOOL_AND . comp_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2164,7 +2549,7 @@ interactive_expr: True BOOL_AND With
 
 interactive_expr: True BOOL_OR With
 ##
-## Ends in an error in state: 297.
+## Ends in an error in state: 298.
 ##
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level BOOL_OR . conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR Attr ]
 ##
@@ -2176,7 +2561,7 @@ interactive_expr: True BOOL_OR With
 
 interactive_expr: True CAT With
 ##
-## Ends in an error in state: 249.
+## Ends in an error in state: 250.
 ##
 ## bin_op(cons_expr_level,CAT,cat_expr_level) -> cons_expr_level CAT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2188,7 +2573,7 @@ interactive_expr: True CAT With
 
 interactive_expr: True COMMA True COMMA With
 ##
-## Ends in an error in state: 292.
+## Ends in an error in state: 293.
 ##
 ## nsepseq(disj_expr_level,COMMA) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End Else EOF COLON Attr ]
 ##
@@ -2200,7 +2585,7 @@ interactive_expr: True COMMA True COMMA With
 
 interactive_expr: True COMMA With
 ##
-## Ends in an error in state: 289.
+## Ends in an error in state: 290.
 ##
 ## tuple(disj_expr_level) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End Else EOF COLON Attr ]
 ##
@@ -2212,7 +2597,7 @@ interactive_expr: True COMMA With
 
 interactive_expr: True CONS With
 ##
-## Ends in an error in state: 263.
+## Ends in an error in state: 264.
 ##
 ## bin_op(add_expr_level,CONS,cons_expr_level) -> add_expr_level CONS . cons_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2224,7 +2609,7 @@ interactive_expr: True CONS With
 
 interactive_expr: True Constr With
 ##
-## Ends in an error in state: 195.
+## Ends in an error in state: 196.
 ##
 ## module_field -> Constr . DOT Ident [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -2237,7 +2622,7 @@ interactive_expr: True Constr With
 
 interactive_expr: True EQ With
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 279.
 ##
 ## bin_op(comp_expr_level,EQ,cat_expr_level) -> comp_expr_level EQ . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2249,7 +2634,7 @@ interactive_expr: True EQ With
 
 interactive_expr: True GE With
 ##
-## Ends in an error in state: 276.
+## Ends in an error in state: 277.
 ##
 ## bin_op(comp_expr_level,GE,cat_expr_level) -> comp_expr_level GE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2261,7 +2646,7 @@ interactive_expr: True GE With
 
 interactive_expr: True GT With
 ##
-## Ends in an error in state: 274.
+## Ends in an error in state: 275.
 ##
 ## bin_op(comp_expr_level,GT,cat_expr_level) -> comp_expr_level GT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2273,7 +2658,7 @@ interactive_expr: True GT With
 
 interactive_expr: True LE With
 ##
-## Ends in an error in state: 272.
+## Ends in an error in state: 273.
 ##
 ## bin_op(comp_expr_level,LE,cat_expr_level) -> comp_expr_level LE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2285,7 +2670,7 @@ interactive_expr: True LE With
 
 interactive_expr: True LT With
 ##
-## Ends in an error in state: 270.
+## Ends in an error in state: 271.
 ##
 ## bin_op(comp_expr_level,LT,cat_expr_level) -> comp_expr_level LT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2297,7 +2682,7 @@ interactive_expr: True LT With
 
 interactive_expr: True MINUS C_None WILD
 ##
-## Ends in an error in state: 262.
+## Ends in an error in state: 263.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2312,7 +2697,7 @@ interactive_expr: True MINUS C_None WILD
 
 interactive_expr: True MINUS With
 ##
-## Ends in an error in state: 261.
+## Ends in an error in state: 262.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS . mult_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2320,11 +2705,11 @@ interactive_expr: True MINUS With
 ## add_expr_level MINUS
 ##
 
-Biep boop bap
+<YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True Mod With
 ##
-## Ends in an error in state: 232.
+## Ends in an error in state: 233.
 ##
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level Mod . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2336,7 +2721,7 @@ interactive_expr: True Mod With
 
 interactive_expr: True NE With
 ##
-## Ends in an error in state: 268.
+## Ends in an error in state: 269.
 ##
 ## bin_op(comp_expr_level,NE,cat_expr_level) -> comp_expr_level NE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2348,7 +2733,7 @@ interactive_expr: True NE With
 
 interactive_expr: True Or With
 ##
-## Ends in an error in state: 247.
+## Ends in an error in state: 248.
 ##
 ## bin_op(disj_expr_level,Or,conj_expr_level) -> disj_expr_level Or . conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR Attr ]
 ##
@@ -2360,7 +2745,7 @@ interactive_expr: True Or With
 
 interactive_expr: True PLUS C_None WILD
 ##
-## Ends in an error in state: 260.
+## Ends in an error in state: 261.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2375,7 +2760,7 @@ interactive_expr: True PLUS C_None WILD
 
 interactive_expr: True PLUS With
 ##
-## Ends in an error in state: 259.
+## Ends in an error in state: 260.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS . mult_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2383,11 +2768,11 @@ interactive_expr: True PLUS With
 ## add_expr_level PLUS
 ##
 
-Bliepaty
+<YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True SLASH With
 ##
-## Ends in an error in state: 230.
+## Ends in an error in state: 231.
 ##
 ## bin_op(mult_expr_level,SLASH,unary_expr_level) -> mult_expr_level SLASH . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2399,7 +2784,7 @@ interactive_expr: True SLASH With
 
 interactive_expr: True TIMES With
 ##
-## Ends in an error in state: 219.
+## Ends in an error in state: 220.
 ##
 ## bin_op(mult_expr_level,TIMES,unary_expr_level) -> mult_expr_level TIMES . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2411,7 +2796,7 @@ interactive_expr: True TIMES With
 
 interactive_expr: True True True WILD
 ##
-## Ends in an error in state: 225.
+## Ends in an error in state: 226.
 ##
 ## seq(core_expr) -> core_expr . seq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2423,7 +2808,7 @@ interactive_expr: True True True WILD
 
 interactive_expr: True True WILD
 ##
-## Ends in an error in state: 223.
+## Ends in an error in state: 224.
 ##
 ## nseq(core_expr) -> core_expr . seq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2435,7 +2820,7 @@ interactive_expr: True True WILD
 
 interactive_expr: True VBAR
 ##
-## Ends in an error in state: 246.
+## Ends in an error in state: 247.
 ##
 ## base_expr(expr) -> disj_expr_level . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ With Type Then SEMI RPAR RBRACKET RBRACE Or Let In End EOF COMMA COLON BOOL_OR Attr ]
@@ -2449,22 +2834,22 @@ interactive_expr: True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True WILD
 ##
-## Ends in an error in state: 221.
+## Ends in an error in state: 222.
 ##
 ## call_expr -> core_expr . nseq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## call_expr_level -> core_expr . [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2477,7 +2862,7 @@ interactive_expr: True WILD
 
 interactive_expr: True With
 ##
-## Ends in an error in state: 498.
+## Ends in an error in state: 522.
 ##
 ## interactive_expr -> expr . EOF [ # ]
 ##
@@ -2488,25 +2873,25 @@ interactive_expr: True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: With
 ##
-## Ends in an error in state: 496.
+## Ends in an error in state: 520.
 ##
 ## interactive_expr' -> . interactive_expr [ # ]
 ##
@@ -2952,7 +3337,7 @@ contract: Let LPAR With
 
 contract: Let WILD COLON Ident VBAR
 ##
-## Ends in an error in state: 380.
+## Ends in an error in state: 383.
 ##
 ## let_binding -> irrefutable option(type_annotation) . EQ expr [ Type Let In EOF Attr ]
 ##
@@ -3023,7 +3408,7 @@ contract: Let WILD COMMA With
 
 contract: Let WILD EQ Bytes Attr With
 ##
-## Ends in an error in state: 169.
+## Ends in an error in state: 170.
 ##
 ## seq(Attr) -> Attr . seq(Attr) [ Type Let In EOF ]
 ##
@@ -3035,7 +3420,7 @@ contract: Let WILD EQ Bytes Attr With
 
 contract: Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 487.
+## Ends in an error in state: 511.
 ##
 ## let_declaration -> Let let_binding . seq(Attr) [ Type Let EOF ]
 ##
@@ -3046,26 +3431,26 @@ contract: Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 221, spurious reduction of production call_expr_level -> core_expr 
-## In state 228, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 210, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 218, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 258, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 248, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 280, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 287, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 294, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 246, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 300, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 301, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 382, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 222, spurious reduction of production call_expr_level -> core_expr 
+## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD EQ With
 ##
-## Ends in an error in state: 381.
+## Ends in an error in state: 384.
 ##
 ## let_binding -> irrefutable option(type_annotation) EQ . expr [ Type Let In EOF Attr ]
 ##
@@ -3077,7 +3462,7 @@ contract: Let WILD EQ With
 
 contract: Let WILD WILD
 ##
-## Ends in an error in state: 379.
+## Ends in an error in state: 382.
 ##
 ## let_binding -> irrefutable . option(type_annotation) EQ expr [ Type Let In EOF Attr ]
 ##
@@ -3232,7 +3617,7 @@ contract: Type Ident EQ Ident TIMES With
 
 contract: Type Ident EQ Ident VBAR
 ##
-## Ends in an error in state: 493.
+## Ends in an error in state: 517.
 ##
 ## declarations -> declaration . [ EOF ]
 ## declarations -> declaration . declarations [ EOF ]
@@ -3248,7 +3633,7 @@ contract: Type Ident EQ Ident VBAR
 ## In state 35, spurious reduction of production fun_type -> cartesian 
 ## In state 26, spurious reduction of production type_expr -> fun_type 
 ## In state 60, spurious reduction of production type_decl -> Type Ident EQ type_expr 
-## In state 489, spurious reduction of production declaration -> type_decl 
+## In state 513, spurious reduction of production declaration -> type_decl 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
diff --git a/src/passes/1-parser/pascaligo.ml b/src/passes/1-parser/pascaligo.ml
index 10eeaa30d..cbbe2014c 100644
--- a/src/passes/1-parser/pascaligo.ml
+++ b/src/passes/1-parser/pascaligo.ml
@@ -50,7 +50,7 @@ module Errors =
            fun () -> Format.asprintf "%a" Location.pp_lift @@ loc)] *)
 
     let generic message =
-      let title () = ""
+      let title () = "scofzpfj%!"
       and message () = message.Region.value
       in Trace.error ~data:[] title message
   end
@@ -182,10 +182,14 @@ let parse_expression (s: string) =
       let ext = PreIO.ext
       let options = PreIO.pre_options ~input:None ~expr:true
     end in
+  Format.printf "coucou : %s\n%!" s;
   let module Unit = PreUnit (IO) in
   match Lexer.(open_token_stream @@ String s) with
     Ok instance ->
       let thunk () = Unit.apply instance Unit.parse_expr
-      in parse (module IO) thunk
+      in 
+  Format.printf "ok\n%!";
+      parse (module IO) thunk
   | Stdlib.Error (Lexer.File_opening msg) ->
+  Format.printf "fail\n%!";
       Trace.fail @@ Errors.generic @@ Region.wrap_ghost msg
diff --git a/src/passes/1-parser/pascaligo/Parser.mly b/src/passes/1-parser/pascaligo/Parser.mly
index 20b89b278..502ea5fb2 100644
--- a/src/passes/1-parser/pascaligo/Parser.mly
+++ b/src/passes/1-parser/pascaligo/Parser.mly
@@ -237,21 +237,10 @@ field_decl:
 
 
 fun_expr:
-  | "function" parameters ":" type_expr "is" expr {
-    let stop   = expr_to_region $6 in
-    let region = cover $1 stop
-    and value  = {kwd_recursive= None;
-                  kwd_function = $1;
-                  param        = $2;
-                  colon        = $3;
-                  ret_type     = $4;
-                  kwd_is       = $5;
-                  return       = $6}
-    in {region; value} }
-  | "recursive" "function" parameters ":" type_expr "is" expr {
+  | ioption ("recursive") "function" parameters ":" type_expr "is" expr {
     let stop   = expr_to_region $7 in
     let region = cover $2 stop
-    and value  = {kwd_recursive= Some($1);
+    and value  = {kwd_recursive= $1;
                   kwd_function = $2;
                   param        = $3;
                   colon        = $4;
@@ -263,7 +252,7 @@ fun_expr:
 (* Function declarations *)
 
 open_fun_decl:
-  "recursive"? "function" fun_name parameters ":" type_expr "is"
+  ioption ("recursive") "function" fun_name parameters ":" type_expr "is"
   block "with" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $10 in
@@ -281,7 +270,7 @@ open_fun_decl:
                   attributes   = None}
     in {region; value}
   }
-| "recursive"? "function" fun_name parameters ":" type_expr "is" expr {
+| ioption ("recursive") "function" fun_name parameters ":" type_expr "is" expr {
     Scoping.check_reserved_name $3;
     let stop   = expr_to_region $8 in
     let region = cover $2 stop
diff --git a/src/passes/1-parser/pascaligo/error.messages.checked-in b/src/passes/1-parser/pascaligo/error.messages.checked-in
index 51fc4f532..03e031548 100644
--- a/src/passes/1-parser/pascaligo/error.messages.checked-in
+++ b/src/passes/1-parser/pascaligo/error.messages.checked-in
@@ -1,8 +1,8 @@
 interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ##
-## Ends in an error in state: 144.
+## Ends in an error in state: 110.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET sep_or_term_list(binding,SEMI)
@@ -11,29 +11,29 @@ interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap LBRACKET With
 ##
-## Ends in an error in state: 137.
+## Ends in an error in state: 103.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET
@@ -43,9 +43,9 @@ interactive_expr: BigMap LBRACKET With
 
 interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 250.
+## Ends in an error in state: 237.
 ##
-## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap sep_or_term_list(binding,SEMI)
@@ -54,31 +54,31 @@ interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap With
 ##
-## Ends in an error in state: 136.
+## Ends in an error in state: 102.
 ##
-## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap
@@ -88,9 +88,9 @@ interactive_expr: BigMap With
 
 interactive_expr: C_Some With
 ##
-## Ends in an error in state: 132.
+## Ends in an error in state: 98.
 ##
-## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## C_Some
@@ -100,7 +100,7 @@ interactive_expr: C_Some With
 
 interactive_expr: Case Unit Of C_Some LPAR WILD With
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 265.
 ##
 ## par(core_pattern) -> LPAR core_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -112,7 +112,7 @@ interactive_expr: Case Unit Of C_Some LPAR WILD With
 
 interactive_expr: Case Unit Of C_Some LPAR With
 ##
-## Ends in an error in state: 270.
+## Ends in an error in state: 257.
 ##
 ## par(core_pattern) -> LPAR . core_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -124,7 +124,7 @@ interactive_expr: Case Unit Of C_Some LPAR With
 
 interactive_expr: Case Unit Of C_Some With
 ##
-## Ends in an error in state: 269.
+## Ends in an error in state: 256.
 ##
 ## constr_pattern -> C_Some . par(core_pattern) [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -136,7 +136,7 @@ interactive_expr: Case Unit Of C_Some With
 
 interactive_expr: Case Unit Of Constr LPAR WILD With
 ##
-## Ends in an error in state: 284.
+## Ends in an error in state: 271.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . COMMA nsepseq(core_pattern,COMMA) [ RPAR ]
@@ -149,7 +149,7 @@ interactive_expr: Case Unit Of Constr LPAR WILD With
 
 interactive_expr: Case Unit Of Constr LPAR With
 ##
-## Ends in an error in state: 268.
+## Ends in an error in state: 255.
 ##
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -161,7 +161,7 @@ interactive_expr: Case Unit Of Constr LPAR With
 
 interactive_expr: Case Unit Of Constr With
 ##
-## Ends in an error in state: 267.
+## Ends in an error in state: 254.
 ##
 ## constr_pattern -> Constr . tuple_pattern [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## constr_pattern -> Constr . [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -174,9 +174,9 @@ interactive_expr: Case Unit Of Constr With
 
 interactive_expr: Case Unit Of LBRACKET VBAR Block
 ##
-## Ends in an error in state: 255.
+## Ends in an error in state: 242.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR)
@@ -186,9 +186,9 @@ interactive_expr: Case Unit Of LBRACKET VBAR Block
 
 interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ##
-## Ends in an error in state: 319.
+## Ends in an error in state: 306.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR) cases(expr)
@@ -197,28 +197,28 @@ interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 308, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 305, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LBRACKET With
 ##
-## Ends in an error in state: 254.
+## Ends in an error in state: 241.
 ##
-## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET
@@ -228,7 +228,7 @@ interactive_expr: Case Unit Of LBRACKET With
 
 interactive_expr: Case Unit Of LPAR WILD COMMA With
 ##
-## Ends in an error in state: 285.
+## Ends in an error in state: 272.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern COMMA . nsepseq(core_pattern,COMMA) [ RPAR ]
 ##
@@ -240,7 +240,7 @@ interactive_expr: Case Unit Of LPAR WILD COMMA With
 
 interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ##
-## Ends in an error in state: 297.
+## Ends in an error in state: 284.
 ##
 ## par(cons_pattern) -> LPAR cons_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -251,15 +251,15 @@ interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
-## In state 290, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
+## In state 278, spurious reduction of production pattern -> core_pattern 
+## In state 277, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LPAR WILD CONS With
 ##
-## Ends in an error in state: 289.
+## Ends in an error in state: 276.
 ##
 ## cons_pattern -> core_pattern CONS . pattern [ RPAR ]
 ##
@@ -271,7 +271,7 @@ interactive_expr: Case Unit Of LPAR WILD CONS With
 
 interactive_expr: Case Unit Of LPAR WILD With
 ##
-## Ends in an error in state: 288.
+## Ends in an error in state: 275.
 ##
 ## cons_pattern -> core_pattern . CONS pattern [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
@@ -285,7 +285,7 @@ interactive_expr: Case Unit Of LPAR WILD With
 
 interactive_expr: Case Unit Of LPAR With
 ##
-## Ends in an error in state: 263.
+## Ends in an error in state: 250.
 ##
 ## par(cons_pattern) -> LPAR . cons_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -298,7 +298,7 @@ interactive_expr: Case Unit Of LPAR With
 
 interactive_expr: Case Unit Of List LBRACKET WILD End
 ##
-## Ends in an error in state: 301.
+## Ends in an error in state: 288.
 ##
 ## injection(List,core_pattern) -> List LBRACKET sep_or_term_list(core_pattern,SEMI) . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -309,15 +309,15 @@ interactive_expr: Case Unit Of List LBRACKET WILD End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 292, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 291, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List LBRACKET With
 ##
-## Ends in an error in state: 299.
+## Ends in an error in state: 286.
 ##
 ## injection(List,core_pattern) -> List LBRACKET . sep_or_term_list(core_pattern,SEMI) RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List LBRACKET . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -330,7 +330,7 @@ interactive_expr: Case Unit Of List LBRACKET With
 
 interactive_expr: Case Unit Of List WILD RBRACKET
 ##
-## Ends in an error in state: 313.
+## Ends in an error in state: 300.
 ##
 ## injection(List,core_pattern) -> List sep_or_term_list(core_pattern,SEMI) . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -341,15 +341,15 @@ interactive_expr: Case Unit Of List WILD RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 292, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 291, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 ##
-## Ends in an error in state: 310.
+## Ends in an error in state: 297.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -362,7 +362,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD SEMI WILD With
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 296.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -376,7 +376,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD With
 
 interactive_expr: Case Unit Of List WILD SEMI With
 ##
-## Ends in an error in state: 306.
+## Ends in an error in state: 293.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -389,7 +389,7 @@ interactive_expr: Case Unit Of List WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD With
 ##
-## Ends in an error in state: 305.
+## Ends in an error in state: 292.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -403,7 +403,7 @@ interactive_expr: Case Unit Of List WILD With
 
 interactive_expr: Case Unit Of List With
 ##
-## Ends in an error in state: 262.
+## Ends in an error in state: 249.
 ##
 ## injection(List,core_pattern) -> List . sep_or_term_list(core_pattern,SEMI) End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -418,9 +418,9 @@ interactive_expr: Case Unit Of List With
 
 interactive_expr: Case Unit Of VBAR Block
 ##
-## Ends in an error in state: 324.
+## Ends in an error in state: 311.
 ##
-## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR)
@@ -430,9 +430,9 @@ interactive_expr: Case Unit Of VBAR Block
 
 interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 325.
+## Ends in an error in state: 312.
 ##
-## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR) cases(expr)
@@ -441,26 +441,26 @@ interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 308, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 305, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ##
-## Ends in an error in state: 321.
+## Ends in an error in state: 308.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . [ RBRACKET End ]
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . VBAR nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
@@ -472,24 +472,24 @@ interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 322.
+## Ends in an error in state: 309.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) VBAR . nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
 ##
@@ -501,7 +501,7 @@ interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 
 interactive_expr: Case Unit Of WILD ARROW With
 ##
-## Ends in an error in state: 316.
+## Ends in an error in state: 303.
 ##
 ## case_clause(expr) -> pattern ARROW . expr [ VBAR RBRACKET End ]
 ##
@@ -513,7 +513,7 @@ interactive_expr: Case Unit Of WILD ARROW With
 
 interactive_expr: Case Unit Of WILD CONS WILD CONS With
 ##
-## Ends in an error in state: 295.
+## Ends in an error in state: 282.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -525,7 +525,7 @@ interactive_expr: Case Unit Of WILD CONS WILD CONS With
 
 interactive_expr: Case Unit Of WILD CONS WILD With
 ##
-## Ends in an error in state: 294.
+## Ends in an error in state: 281.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern . [ RPAR ARROW ]
 ## nsepseq(core_pattern,CONS) -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -538,7 +538,7 @@ interactive_expr: Case Unit Of WILD CONS WILD With
 
 interactive_expr: Case Unit Of WILD CONS With
 ##
-## Ends in an error in state: 292.
+## Ends in an error in state: 279.
 ##
 ## pattern -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -550,7 +550,7 @@ interactive_expr: Case Unit Of WILD CONS With
 
 interactive_expr: Case Unit Of WILD RPAR
 ##
-## Ends in an error in state: 315.
+## Ends in an error in state: 302.
 ##
 ## case_clause(expr) -> pattern . ARROW expr [ VBAR RBRACKET End ]
 ##
@@ -561,14 +561,14 @@ interactive_expr: Case Unit Of WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
+## In state 278, spurious reduction of production pattern -> core_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD With
 ##
-## Ends in an error in state: 291.
+## Ends in an error in state: 278.
 ##
 ## pattern -> core_pattern . [ RPAR ARROW ]
 ## pattern -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -581,10 +581,10 @@ interactive_expr: Case Unit Of WILD With
 
 interactive_expr: Case Unit Of With
 ##
-## Ends in an error in state: 253.
+## Ends in an error in state: 240.
 ##
-## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of
@@ -594,10 +594,10 @@ interactive_expr: Case Unit Of With
 
 interactive_expr: Case Unit VBAR
 ##
-## Ends in an error in state: 252.
+## Ends in an error in state: 239.
 ##
-## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr
@@ -606,26 +606,26 @@ interactive_expr: Case Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case With
 ##
-## Ends in an error in state: 131.
+## Ends in an error in state: 97.
 ##
-## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case
@@ -633,65 +633,12 @@ interactive_expr: Case With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: Constr DOT And With
-##
-## Ends in an error in state: 169.
-##
-## core_expr -> module_field . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## fun_call -> module_field . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## module_field
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Constr DOT Ident DOT With
-##
-## Ends in an error in state: 120.
-##
-## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Constr DOT Ident DOT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Constr DOT Ident With
-##
-## Ends in an error in state: 119.
-##
-## module_fun -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Constr DOT Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Constr DOT With
-##
-## Ends in an error in state: 115.
-##
-## module_field -> Constr DOT . module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Constr DOT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
 interactive_expr: Constr With
 ##
-## Ends in an error in state: 114.
+## Ends in an error in state: 94.
 ##
-## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## module_field -> Constr . DOT module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr
@@ -701,24 +648,24 @@ interactive_expr: Constr With
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 ##
-## Ends in an error in state: 112.
+## Ends in an error in state: 152.
 ##
-## fun_expr -> Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> option(Recursive) Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## Function parameters COLON type_expr Is
+## option(Recursive) Function parameters COLON type_expr Is
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 ##
-## Ends in an error in state: 111.
+## Ends in an error in state: 151.
 ##
-## fun_expr -> Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> option(Recursive) Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## Function parameters COLON type_expr
+## option(Recursive) Function parameters COLON type_expr
 ##
 ## WARNING: This example involves spurious reductions.
 ## This implies that, although the LR(1) items shown above provide an
@@ -734,31 +681,31 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON With
 ##
-## Ends in an error in state: 110.
+## Ends in an error in state: 150.
 ##
-## fun_expr -> Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> option(Recursive) Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## Function parameters COLON
+## option(Recursive) Function parameters COLON
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR With
 ##
-## Ends in an error in state: 109.
+## Ends in an error in state: 149.
 ##
-## fun_expr -> Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> option(Recursive) Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## Function parameters
+## option(Recursive) Function parameters
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON With
 ##
-## Ends in an error in state: 77.
+## Ends in an error in state: 142.
 ##
 ## param_decl -> Const Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -770,7 +717,7 @@ interactive_expr: Function LPAR Const Ident COLON With
 
 interactive_expr: Function LPAR Const Ident With
 ##
-## Ends in an error in state: 76.
+## Ends in an error in state: 141.
 ##
 ## param_decl -> Const Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -782,7 +729,7 @@ interactive_expr: Function LPAR Const Ident With
 
 interactive_expr: Function LPAR Const With
 ##
-## Ends in an error in state: 75.
+## Ends in an error in state: 140.
 ##
 ## param_decl -> Const . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -794,7 +741,7 @@ interactive_expr: Function LPAR Const With
 
 interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 ##
-## Ends in an error in state: 80.
+## Ends in an error in state: 145.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl SEMI . nsepseq(param_decl,SEMI) [ RPAR ]
 ##
@@ -806,7 +753,7 @@ interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 
 interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ##
-## Ends in an error in state: 79.
+## Ends in an error in state: 144.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl . [ RPAR ]
 ## nsepseq(param_decl,SEMI) -> param_decl . SEMI nsepseq(param_decl,SEMI) [ RPAR ]
@@ -821,15 +768,15 @@ interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ## In state 15, spurious reduction of production core_type -> Ident 
 ## In state 29, spurious reduction of production cartesian -> core_type 
 ## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 74, spurious reduction of production param_type -> fun_type 
-## In state 73, spurious reduction of production param_decl -> Var Ident COLON param_type 
+## In state 139, spurious reduction of production param_type -> fun_type 
+## In state 138, spurious reduction of production param_decl -> Var Ident COLON param_type 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Var Ident COLON With
 ##
-## Ends in an error in state: 72.
+## Ends in an error in state: 137.
 ##
 ## param_decl -> Var Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -841,7 +788,7 @@ interactive_expr: Function LPAR Var Ident COLON With
 
 interactive_expr: Function LPAR Var Ident With
 ##
-## Ends in an error in state: 71.
+## Ends in an error in state: 136.
 ##
 ## param_decl -> Var Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -853,7 +800,7 @@ interactive_expr: Function LPAR Var Ident With
 
 interactive_expr: Function LPAR Var With
 ##
-## Ends in an error in state: 70.
+## Ends in an error in state: 135.
 ##
 ## param_decl -> Var . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -865,7 +812,7 @@ interactive_expr: Function LPAR Var With
 
 interactive_expr: Function LPAR With
 ##
-## Ends in an error in state: 69.
+## Ends in an error in state: 134.
 ##
 ## par(nsepseq(param_decl,SEMI)) -> LPAR . nsepseq(param_decl,SEMI) RPAR [ COLON ]
 ##
@@ -877,21 +824,21 @@ interactive_expr: Function LPAR With
 
 interactive_expr: Function With
 ##
-## Ends in an error in state: 108.
+## Ends in an error in state: 133.
 ##
-## fun_expr -> Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> option(Recursive) Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## Function
+## option(Recursive) Function
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident DOT Ident ASS
 ##
-## Ends in an error in state: 147.
+## Ends in an error in state: 113.
 ##
-## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> projection . [ With LBRACKET ]
 ##
 ## The known suffix of the stack is as follows:
@@ -901,17 +848,17 @@ interactive_expr: Ident DOT Ident ASS
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 322, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 325, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident DOT Int DOT With
 ##
-## Ends in an error in state: 124.
+## Ends in an error in state: 323.
 ##
-## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection DOT
@@ -921,10 +868,10 @@ interactive_expr: Ident DOT Int DOT With
 
 interactive_expr: Ident DOT Int While
 ##
-## Ends in an error in state: 123.
+## Ends in an error in state: 322.
 ##
-## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection
@@ -934,9 +881,9 @@ interactive_expr: Ident DOT Int While
 
 interactive_expr: Ident DOT With
 ##
-## Ends in an error in state: 334.
+## Ends in an error in state: 319.
 ##
-## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident DOT
@@ -946,9 +893,9 @@ interactive_expr: Ident DOT With
 
 interactive_expr: Ident LBRACKET Unit VBAR
 ##
-## Ends in an error in state: 234.
+## Ends in an error in state: 221.
 ##
-## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET expr
@@ -957,25 +904,25 @@ interactive_expr: Ident LBRACKET Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LBRACKET With
 ##
-## Ends in an error in state: 233.
+## Ends in an error in state: 220.
 ##
-## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET
@@ -985,7 +932,7 @@ interactive_expr: Ident LBRACKET With
 
 interactive_expr: Ident LPAR Unit COMMA With
 ##
-## Ends in an error in state: 332.
+## Ends in an error in state: 317.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
 ##
@@ -997,7 +944,7 @@ interactive_expr: Ident LPAR Unit COMMA With
 
 interactive_expr: Ident LPAR Unit VBAR
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 316.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RPAR ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
@@ -1009,25 +956,25 @@ interactive_expr: Ident LPAR Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LPAR With
 ##
-## Ends in an error in state: 107.
+## Ends in an error in state: 92.
 ##
-## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -1037,12 +984,12 @@ interactive_expr: Ident LPAR With
 
 interactive_expr: Ident While
 ##
-## Ends in an error in state: 106.
+## Ends in an error in state: 91.
 ##
-## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> Ident . [ With LBRACKET ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -1052,7 +999,7 @@ interactive_expr: Ident While
 
 interactive_expr: Ident With Record Ident DOT With
 ##
-## Ends in an error in state: 155.
+## Ends in an error in state: 121.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ EQ ]
 ##
@@ -1064,9 +1011,9 @@ interactive_expr: Ident With Record Ident DOT With
 
 interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ##
-## Ends in an error in state: 230.
+## Ends in an error in state: 217.
 ##
-## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_path_assignment,SEMI)
@@ -1075,26 +1022,26 @@ interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 210, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 126, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 228.
+## Ends in an error in state: 215.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1107,7 +1054,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 227.
+## Ends in an error in state: 214.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1120,24 +1067,24 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 224.
+## Ends in an error in state: 211.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1150,7 +1097,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 223.
+## Ends in an error in state: 210.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1163,24 +1110,24 @@ interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ With
 ##
-## Ends in an error in state: 162.
+## Ends in an error in state: 128.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) EQ . expr [ SEMI RBRACKET End ]
 ##
@@ -1192,7 +1139,7 @@ interactive_expr: Ident With Record Ident EQ With
 
 interactive_expr: Ident With Record Ident With
 ##
-## Ends in an error in state: 154.
+## Ends in an error in state: 120.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ EQ ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ EQ ]
@@ -1205,9 +1152,9 @@ interactive_expr: Ident With Record Ident With
 
 interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 157.
+## Ends in an error in state: 123.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_path_assignment,SEMI)
@@ -1216,28 +1163,28 @@ interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 210, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 126, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record LBRACKET With
 ##
-## Ends in an error in state: 153.
+## Ends in an error in state: 119.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -1247,10 +1194,10 @@ interactive_expr: Ident With Record LBRACKET With
 
 interactive_expr: Ident With Record With
 ##
-## Ends in an error in state: 152.
+## Ends in an error in state: 118.
 ##
-## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -1260,9 +1207,9 @@ interactive_expr: Ident With Record With
 
 interactive_expr: Ident With With
 ##
-## Ends in an error in state: 151.
+## Ends in an error in state: 117.
 ##
-## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## path With
@@ -1272,9 +1219,9 @@ interactive_expr: Ident With With
 
 interactive_expr: If Unit Then Unit Else With
 ##
-## Ends in an error in state: 341.
+## Ends in an error in state: 331.
 ##
-## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI) Else
@@ -1284,9 +1231,9 @@ interactive_expr: If Unit Then Unit Else With
 
 interactive_expr: If Unit Then Unit SEMI EQ
 ##
-## Ends in an error in state: 340.
+## Ends in an error in state: 330.
 ##
-## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI)
@@ -1296,9 +1243,9 @@ interactive_expr: If Unit Then Unit SEMI EQ
 
 interactive_expr: If Unit Then Unit VBAR
 ##
-## Ends in an error in state: 339.
+## Ends in an error in state: 329.
 ##
-## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr
@@ -1307,25 +1254,25 @@ interactive_expr: If Unit Then Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If Unit Then With
 ##
-## Ends in an error in state: 338.
+## Ends in an error in state: 328.
 ##
-## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then
@@ -1335,9 +1282,9 @@ interactive_expr: If Unit Then With
 
 interactive_expr: If Unit VBAR
 ##
-## Ends in an error in state: 337.
+## Ends in an error in state: 327.
 ##
-## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr
@@ -1346,25 +1293,25 @@ interactive_expr: If Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If With
 ##
-## Ends in an error in state: 105.
+## Ends in an error in state: 90.
 ##
-## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If
@@ -1374,9 +1321,9 @@ interactive_expr: If With
 
 interactive_expr: LPAR Bytes RPAR With
 ##
-## Ends in an error in state: 164.
+## Ends in an error in state: 130.
 ##
-## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## par(expr)
@@ -1386,9 +1333,9 @@ interactive_expr: LPAR Bytes RPAR With
 
 interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ##
-## Ends in an error in state: 345.
+## Ends in an error in state: 335.
 ##
-## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## tuple_comp -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
 ##
 ## The known suffix of the stack is as follows:
@@ -1398,27 +1345,125 @@ interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 342, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
-## In state 221, spurious reduction of production expr -> cond_expr 
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 332, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
+## In state 206, spurious reduction of production expr -> cond_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON BigMap With
+##
+## Ends in an error in state: 18.
+##
+## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## BigMap
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Constr Of With
+##
+## Ends in an error in state: 27.
+##
+## variant -> Constr Of . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## Constr Of
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Constr VBAR With
+##
+## Ends in an error in state: 39.
+##
+## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## variant VBAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Constr With
+##
+## Ends in an error in state: 26.
+##
+## variant -> Constr . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## variant -> Constr . Of fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## Constr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Ident ARROW With
+##
+## Ends in an error in state: 36.
+##
+## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## cartesian ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Ident TIMES Ident TIMES With
+##
+## Ends in an error in state: 33.
+##
+## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type TIMES
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Ident TIMES LPAR Ident RPAR With
+##
+## Ends in an error in state: 32.
+##
+## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COLON Ident TIMES With
+##
+## Ends in an error in state: 30.
+##
+## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type TIMES
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR Unit COLON Ident VBAR
 ##
-## Ends in an error in state: 351.
+## Ends in an error in state: 341.
 ##
-## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR disj_expr COLON type_expr
@@ -1435,2820 +1480,12 @@ interactive_expr: LPAR Unit COLON Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON With
-##
-## Ends in an error in state: 350.
-##
-## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## LPAR disj_expr COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COMMA With
-##
-## Ends in an error in state: 347.
-##
-## tuple_comp -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
-##
-## The known suffix of the stack is as follows:
-## expr COMMA
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit VBAR
-##
-## Ends in an error in state: 349.
-##
-## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## disj_expr -> disj_expr . Or conj_expr [ RPAR Or COMMA COLON ]
-## expr -> disj_expr . [ RPAR COMMA ]
-##
-## The known suffix of the stack is as follows:
-## LPAR disj_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR With
-##
-## Ends in an error in state: 103.
-##
-## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## LPAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List LBRACKET Unit End
-##
-## Ends in an error in state: 355.
-##
-## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List LBRACKET With
-##
-## Ends in an error in state: 353.
-##
-## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit RBRACKET
-##
-## Ends in an error in state: 367.
-##
-## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List With
-##
-## Ends in an error in state: 102.
-##
-## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: MINUS With
-##
-## Ends in an error in state: 101.
-##
-## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## MINUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map LBRACKET Unit ARROW Bytes End
-##
-## Ends in an error in state: 372.
-##
-## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map LBRACKET With
-##
-## Ends in an error in state: 370.
-##
-## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes RBRACKET
-##
-## Ends in an error in state: 375.
-##
-## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
-##
-## Ends in an error in state: 247.
-##
-## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
-##
-## Ends in an error in state: 246.
-##
-## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
-## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI With
-##
-## Ends in an error in state: 243.
-##
-## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes VBAR
-##
-## Ends in an error in state: 242.
-##
-## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
-## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW With
-##
-## Ends in an error in state: 240.
-##
-## binding -> expr ARROW . expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit VBAR
-##
-## Ends in an error in state: 239.
-##
-## binding -> expr . ARROW expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map With
-##
-## Ends in an error in state: 100.
-##
-## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Not Bytes With
-##
-## Ends in an error in state: 166.
-##
-## add_expr -> mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Not With
-##
-## Ends in an error in state: 96.
-##
-## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Not
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes RBRACKET
-##
-## Ends in an error in state: 390.
-##
-## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
-##
-## Ends in an error in state: 388.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 387.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
-## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI With
-##
-## Ends in an error in state: 384.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 383.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
-## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ With
-##
-## Ends in an error in state: 95.
-##
-## field_assignment -> Ident EQ . expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## Ident EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident With
-##
-## Ends in an error in state: 94.
-##
-## field_assignment -> Ident . EQ expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record LBRACKET Ident EQ Bytes End
-##
-## Ends in an error in state: 379.
-##
-## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record LBRACKET With
-##
-## Ends in an error in state: 93.
-##
-## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record With
-##
-## Ends in an error in state: 92.
-##
-## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set LBRACKET Unit End
-##
-## Ends in an error in state: 394.
-##
-## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set LBRACKET With
-##
-## Ends in an error in state: 392.
-##
-## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit RBRACKET
-##
-## Ends in an error in state: 397.
-##
-## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit SEMI Unit SEMI With
-##
-## Ends in an error in state: 364.
-##
-## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit SEMI Unit VBAR
-##
-## Ends in an error in state: 363.
-##
-## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
-## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit SEMI With
-##
-## Ends in an error in state: 360.
-##
-## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit VBAR
-##
-## Ends in an error in state: 359.
-##
-## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
-## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set With
-##
-## Ends in an error in state: 91.
-##
-## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit And With
-##
-## Ends in an error in state: 218.
-##
-## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## conj_expr And
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit CAT With
-##
-## Ends in an error in state: 194.
-##
-## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## cons_expr CAT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit COLON
-##
-## Ends in an error in state: 188.
-##
-## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## expr -> disj_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-##
-## The known suffix of the stack is as follows:
-## disj_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit CONS With
-##
-## Ends in an error in state: 201.
-##
-## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr CONS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Contains With
-##
-## Ends in an error in state: 191.
-##
-## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_expr Contains
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit EQ With
-##
-## Ends in an error in state: 214.
-##
-## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit GE With
-##
-## Ends in an error in state: 212.
-##
-## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr GE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit GT With
-##
-## Ends in an error in state: 210.
-##
-## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr GT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit LE With
-##
-## Ends in an error in state: 208.
-##
-## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr LE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit LT With
-##
-## Ends in an error in state: 206.
-##
-## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr LT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit MINUS Unit With
-##
-## Ends in an error in state: 200.
-##
-## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr MINUS mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit MINUS With
-##
-## Ends in an error in state: 199.
-##
-## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr MINUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Mod With
-##
-## Ends in an error in state: 184.
-##
-## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr Mod
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit NE With
-##
-## Ends in an error in state: 204.
-##
-## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr NE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Or With
-##
-## Ends in an error in state: 189.
-##
-## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
-##
-## The known suffix of the stack is as follows:
-## disj_expr Or
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit PLUS Unit With
-##
-## Ends in an error in state: 198.
-##
-## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr PLUS mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit PLUS With
-##
-## Ends in an error in state: 197.
-##
-## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr PLUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit SLASH With
-##
-## Ends in an error in state: 182.
-##
-## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr SLASH
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit TIMES With
-##
-## Ends in an error in state: 167.
-##
-## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr TIMES
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit VBAR
-##
-## Ends in an error in state: 586.
-##
-## interactive_expr -> expr . EOF [ # ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit With
-##
-## Ends in an error in state: 190.
-##
-## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: With
-##
-## Ends in an error in state: 584.
-##
-## interactive_expr' -> . interactive_expr [ # ]
-##
-## The known suffix of the stack is as follows:
-##
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes LBRACKET String End
-##
-## Ends in an error in state: 530.
-##
-## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes LBRACKET sep_or_term_list(String,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes LBRACKET With
-##
-## Ends in an error in state: 529.
-##
-## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End Attributes String End SEMI With
-##
-## Ends in an error in state: 579.
-##
-## seq(declaration) -> declaration . seq(declaration) [ EOF ]
-##
-## The known suffix of the stack is as follows:
-## declaration
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End SEMI With
-##
-## Ends in an error in state: 577.
-##
-## nseq(declaration) -> declaration . seq(declaration) [ EOF ]
-##
-## The known suffix of the stack is as follows:
-## declaration
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End With
-##
-## Ends in an error in state: 572.
-##
-## attr_decl -> open_attr_decl . option(SEMI) [ Type Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_attr_decl
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String RBRACKET
-##
-## Ends in an error in state: 534.
-##
-## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes sep_or_term_list(String,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI String SEMI With
-##
-## Ends in an error in state: 525.
-##
-## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI String With
-##
-## Ends in an error in state: 524.
-##
-## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
-## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI With
-##
-## Ends in an error in state: 523.
-##
-## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String With
-##
-## Ends in an error in state: 522.
-##
-## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
-## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes With
-##
-## Ends in an error in state: 521.
-##
-## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 570.
-##
-## const_decl -> open_const_decl . option(SEMI) [ Type Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_const_decl
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 478, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
-## In state 479, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident EQ With
-##
-## Ends in an error in state: 477.
-##
-## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident VBAR
-##
-## Ends in an error in state: 476.
-##
-## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON With
-##
-## Ends in an error in state: 475.
-##
-## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident With
-##
-## Ends in an error in state: 474.
-##
-## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const With
-##
-## Ends in an error in state: 473.
-##
-## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Const
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET VBAR Block
-##
-## Ends in an error in state: 484.
-##
-## case(if_clause) -> Case expr Of LBRACKET option(VBAR) . cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET option(VBAR)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET WILD ARROW Skip End
-##
-## Ends in an error in state: 513.
-##
-## case(if_clause) -> Case expr Of LBRACKET option(VBAR) cases(if_clause) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET option(VBAR) cases(if_clause)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET With
-##
-## Ends in an error in state: 483.
-##
-## case(if_clause) -> Case expr Of LBRACKET . option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of VBAR Block
-##
-## Ends in an error in state: 518.
-##
-## case(if_clause) -> Case expr Of option(VBAR) . cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of option(VBAR)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip RBRACKET
-##
-## Ends in an error in state: 519.
-##
-## case(if_clause) -> Case expr Of option(VBAR) cases(if_clause) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of option(VBAR) cases(if_clause)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip VBAR With
-##
-## Ends in an error in state: 516.
-##
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) VBAR . nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## case_clause(if_clause) VBAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip With
-##
-## Ends in an error in state: 515.
-##
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . [ RBRACKET End ]
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . VBAR nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## case_clause(if_clause)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW With
-##
-## Ends in an error in state: 486.
-##
-## case_clause(if_clause) -> pattern ARROW . if_clause [ VBAR RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## pattern ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD RPAR
-##
-## Ends in an error in state: 485.
-##
-## case_clause(if_clause) -> pattern . ARROW if_clause [ VBAR RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## pattern
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of With
-##
-## Ends in an error in state: 482.
-##
-## case(if_clause) -> Case expr Of . option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case expr Of . LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit VBAR
-##
-## Ends in an error in state: 481.
-##
-## case(if_clause) -> Case expr . Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case expr . Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case With
-##
-## Ends in an error in state: 480.
-##
-## case(if_clause) -> Case . expr Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case . expr Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr DOT And With
-##
-## Ends in an error in state: 493.
-##
-## fun_call -> module_field . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## module_field
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr With
-##
-## Ends in an error in state: 472.
-##
-## module_field -> Constr . DOT module_fun [ LPAR ]
-## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
-##
-## The known suffix of the stack is as follows:
-## Constr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW Ident With
-##
-## Ends in an error in state: 459.
-##
-## for_loop -> For Ident option(arrow_clause) . In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW With
-##
-## Ends in an error in state: 457.
-##
-## arrow_clause -> ARROW . Ident [ In ]
-##
-## The known suffix of the stack is as follows:
-## ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To Unit VBAR
-##
-## Ends in an error in state: 470.
-##
-## for_loop -> For var_assign To expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign To expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To With
-##
-## Ends in an error in state: 469.
-##
-## for_loop -> For var_assign To . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign To
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes VBAR
-##
-## Ends in an error in state: 468.
-##
-## for_loop -> For var_assign . To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 456, spurious reduction of production var_assign -> Ident ASS expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS With
-##
-## Ends in an error in state: 455.
-##
-## var_assign -> Ident ASS . expr [ To ]
-##
-## The known suffix of the stack is as follows:
-## Ident ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set Unit VBAR
-##
-## Ends in an error in state: 465.
-##
-## for_loop -> For Ident option(arrow_clause) In collection expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In collection expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set With
-##
-## Ends in an error in state: 464.
-##
-## for_loop -> For Ident option(arrow_clause) In collection . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In collection
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In With
-##
-## Ends in an error in state: 460.
-##
-## for_loop -> For Ident option(arrow_clause) In . collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident With
-##
-## Ends in an error in state: 454.
-##
-## for_loop -> For Ident . option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-## var_assign -> Ident . ASS expr [ To ]
-##
-## The known suffix of the stack is as follows:
-## For Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For With
-##
-## Ends in an error in state: 453.
-##
-## for_loop -> For . var_assign To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-## for_loop -> For . Ident option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident ASS With
-##
-## Ends in an error in state: 499.
-##
-## assignment -> lhs ASS . rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## lhs ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident DOT Ident With
-##
-## Ends in an error in state: 492.
-##
-## lhs -> path . [ ASS ]
-## map_lookup -> path . brackets(expr) [ ASS ]
-##
-## The known suffix of the stack is as follows:
-## path
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
-## In state 420, spurious reduction of production path -> projection 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident LBRACKET Bytes RBRACKET With
-##
-## Ends in an error in state: 498.
-##
-## assignment -> lhs . ASS rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## lhs
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident With
-##
-## Ends in an error in state: 452.
-##
-## fun_call -> Ident . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
-## path -> Ident . [ LBRACKET ASS ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE Skip End
-##
-## Ends in an error in state: 550.
-##
-## clause_block -> LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## LBRACE sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE With
-##
-## Ends in an error in state: 451.
-##
-## clause_block -> LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## LBRACE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip Else With
-##
-## Ends in an error in state: 556.
-##
-## conditional -> If expr Then if_clause option(SEMI) Else . if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause option(SEMI) Else
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip SEMI EQ
-##
-## Ends in an error in state: 555.
-##
-## conditional -> If expr Then if_clause option(SEMI) . Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause option(SEMI)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip With
-##
-## Ends in an error in state: 554.
-##
-## conditional -> If expr Then if_clause . option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then With
-##
-## Ends in an error in state: 450.
-##
-## conditional -> If expr Then . if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit VBAR
-##
-## Ends in an error in state: 449.
-##
-## conditional -> If expr . Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If With
-##
-## Ends in an error in state: 448.
-##
-## conditional -> If . expr Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT Ident With
-##
-## Ends in an error in state: 419.
-##
-## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Constr DOT Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT With
-##
-## Ends in an error in state: 418.
-##
-## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Constr DOT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr With
-##
-## Ends in an error in state: 417.
-##
-## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Constr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident VBAR
-##
-## Ends in an error in state: 425.
-##
-## map_patch -> Patch path . With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch path . With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch path . With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch path
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 416, spurious reduction of production path -> Ident 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident While
-##
-## Ends in an error in state: 416.
-##
-## path -> Ident . [ With VBAR SEMI RBRACKET RBRACE End Else ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET Unit ARROW Bytes End
-##
-## Ends in an error in state: 441.
-##
-## ne_injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET With
-##
-## Ends in an error in state: 440.
-##
-## ne_injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map Unit ARROW Bytes RBRACKET
-##
-## Ends in an error in state: 443.
-##
-## ne_injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map With
-##
-## Ends in an error in state: 439.
-##
-## ne_injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record Ident EQ Bytes RBRACKET
-##
-## Ends in an error in state: 437.
-##
-## ne_injection(Record,field_assignment) -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET Ident EQ Bytes End
-##
-## Ends in an error in state: 435.
-##
-## ne_injection(Record,field_assignment) -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET With
-##
-## Ends in an error in state: 434.
-##
-## ne_injection(Record,field_assignment) -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record With
-##
-## Ends in an error in state: 433.
-##
-## ne_injection(Record,field_assignment) -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Record,field_assignment) -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET Unit End
-##
-## Ends in an error in state: 429.
-##
-## ne_injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET With
-##
-## Ends in an error in state: 428.
-##
-## ne_injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set Unit RBRACKET
-##
-## Ends in an error in state: 431.
-##
-## ne_injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set With
-##
-## Ends in an error in state: 427.
-##
-## ne_injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With With
-##
-## Ends in an error in state: 426.
-##
-## map_patch -> Patch path With . ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch path With . ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch path With . ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch path With
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch With
-##
-## Ends in an error in state: 424.
-##
-## map_patch -> Patch . path With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch . path With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch . path With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Map With
-##
-## Ends in an error in state: 422.
-##
-## map_remove -> Remove expr From Map . path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Set With
-##
-## Ends in an error in state: 415.
-##
-## set_remove -> Remove expr From Set . path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From With
-##
-## Ends in an error in state: 414.
-##
-## map_remove -> Remove expr From . Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove expr From . Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit VBAR
-##
-## Ends in an error in state: 413.
-##
-## map_remove -> Remove expr . From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove expr . From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove With
-##
-## Ends in an error in state: 412.
-##
-## map_remove -> Remove . expr From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove . expr From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
-##
-## Ends in an error in state: 564.
-##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters COLON type_expr Is block
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
-##
-## Ends in an error in state: 565.
-##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters COLON type_expr Is block With
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip RBRACE
-##
-## Ends in an error in state: 558.
-##
-## block -> Begin sep_or_term_list(statement,SEMI) . End [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Begin sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip SEMI With
-##
-## Ends in an error in state: 539.
-##
-## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
-## seq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip With
-##
-## Ends in an error in state: 538.
-##
-## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
-## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
-## seq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI With
-##
-## Ends in an error in state: 537.
-##
-## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
-## nseq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip With
-##
-## Ends in an error in state: 536.
-##
-## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
-## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
-## nseq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident ASS With
-##
-## Ends in an error in state: 408.
-##
-## unqualified_decl(ASS) -> Ident COLON type_expr ASS . expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident VBAR
-##
-## Ends in an error in state: 407.
-##
-## unqualified_decl(ASS) -> Ident COLON type_expr . ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON With
-##
-## Ends in an error in state: 406.
-##
-## unqualified_decl(ASS) -> Ident COLON . type_expr ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident With
-##
-## Ends in an error in state: 405.
-##
-## unqualified_decl(ASS) -> Ident . COLON type_expr ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var With
-##
-## Ends in an error in state: 404.
-##
-## open_var_decl -> Var . unqualified_decl(ASS) [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Var
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While Unit VBAR
-##
-## Ends in an error in state: 402.
-##
-## while_loop -> While expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## While expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While With
-##
-## Ends in an error in state: 401.
-##
-## while_loop -> While . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## While
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin With
-##
-## Ends in an error in state: 403.
-##
-## block -> Begin . sep_or_term_list(statement,SEMI) End [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Begin
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE Skip End
-##
-## Ends in an error in state: 561.
-##
-## block -> Block LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block LBRACE sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE With
-##
-## Ends in an error in state: 400.
-##
-## block -> Block LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block LBRACE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block With
-##
-## Ends in an error in state: 399.
-##
-## block -> Block . LBRACE sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes VBAR
-##
-## Ends in an error in state: 568.
-##
-## fun_decl -> open_fun_decl . option(SEMI) [ Type Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_fun_decl
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 563, spurious reduction of production open_fun_decl -> Function Ident parameters COLON type_expr Is expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
-##
-## Ends in an error in state: 87.
-##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON type_expr Is . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters COLON type_expr Is
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
-##
-## Ends in an error in state: 86.
-##
-## open_fun_decl -> Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON type_expr . Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
-##
-## Ends in an error in state: 85.
-##
-## open_fun_decl -> Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON . type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR With
-##
-## Ends in an error in state: 84.
-##
-## open_fun_decl -> Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters . COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident parameters
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident With
-##
-## Ends in an error in state: 68.
-##
-## open_fun_decl -> Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident . parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function With
-##
-## Ends in an error in state: 67.
-##
-## open_fun_decl -> Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function . Ident parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Function
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is BigMap With
-##
-## Ends in an error in state: 18.
-##
-## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## BigMap
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Constr Of With
-##
-## Ends in an error in state: 27.
-##
-## variant -> Constr Of . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## Constr Of
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Constr VBAR With
-##
-## Ends in an error in state: 39.
-##
-## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## variant VBAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Constr With
-##
-## Ends in an error in state: 26.
-##
-## variant -> Constr . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## variant -> Constr . Of fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## Constr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident ARROW With
-##
-## Ends in an error in state: 36.
-##
-## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## cartesian ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident TIMES Ident TIMES With
-##
-## Ends in an error in state: 33.
-##
-## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type TIMES
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident TIMES LPAR Ident RPAR With
-##
-## Ends in an error in state: 32.
-##
-## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident TIMES With
-##
-## Ends in an error in state: 30.
-##
-## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type TIMES
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident VBAR
-##
-## Ends in an error in state: 64.
-##
-## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Type Ident Is type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident With
+interactive_expr: LPAR Unit COLON Ident With
 ##
 ## Ends in an error in state: 15.
 ##
-## core_type -> Ident . [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Ident . [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -4256,12 +1493,12 @@ contract: Type Ident Is Ident With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is LPAR Constr RPAR With
+interactive_expr: LPAR Unit COLON LPAR Ident RPAR With
 ##
 ## Ends in an error in state: 29.
 ##
-## cartesian -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type
@@ -4269,11 +1506,11 @@ contract: Type Ident Is LPAR Constr RPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is LPAR Ident VBAR
+interactive_expr: LPAR Unit COLON LPAR Ident VBAR
 ##
 ## Ends in an error in state: 61.
 ##
-## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR type_expr
@@ -4290,11 +1527,11 @@ contract: Type Ident Is LPAR Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is LPAR With
+interactive_expr: LPAR Unit COLON LPAR With
 ##
 ## Ends in an error in state: 6.
 ##
-## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -4302,11 +1539,11 @@ contract: Type Ident Is LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is List With
+interactive_expr: LPAR Unit COLON List With
 ##
 ## Ends in an error in state: 13.
 ##
-## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List
@@ -4314,7 +1551,7 @@ contract: Type Ident Is List With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Map LPAR Ident COMMA With
+interactive_expr: LPAR Unit COLON Map LPAR Ident COMMA With
 ##
 ## Ends in an error in state: 21.
 ##
@@ -4326,7 +1563,7 @@ contract: Type Ident Is Map LPAR Ident COMMA With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Map LPAR Ident VBAR
+interactive_expr: LPAR Unit COLON Map LPAR Ident VBAR
 ##
 ## Ends in an error in state: 20.
 ##
@@ -4348,11 +1585,11 @@ contract: Type Ident Is Map LPAR Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Map LPAR With
+interactive_expr: LPAR Unit COLON Map LPAR With
 ##
 ## Ends in an error in state: 12.
 ##
-## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -4360,11 +1597,11 @@ contract: Type Ident Is Map LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Map With
+interactive_expr: LPAR Unit COLON Map With
 ##
 ## Ends in an error in state: 11.
 ##
-## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map
@@ -4372,11 +1609,11 @@ contract: Type Ident Is Map With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON Ident RBRACKET
+interactive_expr: LPAR Unit COLON Record Ident COLON Ident RBRACKET
 ##
 ## Ends in an error in state: 59.
 ##
-## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_decl,SEMI)
@@ -4396,7 +1633,7 @@ contract: Type Ident Is Record Ident COLON Ident RBRACKET
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident SEMI With
+interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Ident SEMI With
 ##
 ## Ends in an error in state: 57.
 ##
@@ -4409,7 +1646,7 @@ contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident SEMI Wit
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident VBAR
+interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Ident VBAR
 ##
 ## Ends in an error in state: 56.
 ##
@@ -4433,7 +1670,7 @@ contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON Ident SEMI With
+interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI With
 ##
 ## Ends in an error in state: 53.
 ##
@@ -4446,7 +1683,7 @@ contract: Type Ident Is Record Ident COLON Ident SEMI With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON Ident VBAR
+interactive_expr: LPAR Unit COLON Record Ident COLON Ident VBAR
 ##
 ## Ends in an error in state: 52.
 ##
@@ -4470,7 +1707,7 @@ contract: Type Ident Is Record Ident COLON Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident COLON With
+interactive_expr: LPAR Unit COLON Record Ident COLON With
 ##
 ## Ends in an error in state: 10.
 ##
@@ -4482,7 +1719,7 @@ contract: Type Ident Is Record Ident COLON With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record Ident With
+interactive_expr: LPAR Unit COLON Record Ident With
 ##
 ## Ends in an error in state: 9.
 ##
@@ -4494,11 +1731,11 @@ contract: Type Ident Is Record Ident With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record LBRACKET Ident COLON Ident End
+interactive_expr: LPAR Unit COLON Record LBRACKET Ident COLON Ident End
 ##
 ## Ends in an error in state: 48.
 ##
-## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_decl,SEMI)
@@ -4518,11 +1755,11 @@ contract: Type Ident Is Record LBRACKET Ident COLON Ident End
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record LBRACKET With
+interactive_expr: LPAR Unit COLON Record LBRACKET With
 ##
 ## Ends in an error in state: 8.
 ##
-## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -4530,12 +1767,12 @@ contract: Type Ident Is Record LBRACKET With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Record With
+interactive_expr: LPAR Unit COLON Record With
 ##
 ## Ends in an error in state: 7.
 ##
-## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -4543,11 +1780,11 @@ contract: Type Ident Is Record With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is Set With
+interactive_expr: LPAR Unit COLON Set With
 ##
 ## Ends in an error in state: 5.
 ##
-## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set
@@ -4555,11 +1792,11 @@ contract: Type Ident Is Set With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-contract: Type Ident Is VBAR Const
+interactive_expr: LPAR Unit COLON VBAR Const
 ##
 ## Ends in an error in state: 25.
 ##
-## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## option(VBAR)
@@ -4567,11 +1804,2685 @@ contract: Type Ident Is VBAR Const
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: LPAR Unit COLON With
+##
+## Ends in an error in state: 340.
+##
+## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## LPAR disj_expr COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COMMA With
+##
+## Ends in an error in state: 337.
+##
+## tuple_comp -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
+##
+## The known suffix of the stack is as follows:
+## expr COMMA
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit VBAR
+##
+## Ends in an error in state: 339.
+##
+## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## disj_expr -> disj_expr . Or conj_expr [ RPAR Or COMMA COLON ]
+## expr -> disj_expr . [ RPAR COMMA ]
+##
+## The known suffix of the stack is as follows:
+## LPAR disj_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR With
+##
+## Ends in an error in state: 88.
+##
+## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## LPAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List LBRACKET Unit End
+##
+## Ends in an error in state: 345.
+##
+## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List LBRACKET With
+##
+## Ends in an error in state: 343.
+##
+## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit RBRACKET
+##
+## Ends in an error in state: 357.
+##
+## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit SEMI Unit SEMI With
+##
+## Ends in an error in state: 354.
+##
+## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit SEMI Unit VBAR
+##
+## Ends in an error in state: 353.
+##
+## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
+## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit SEMI With
+##
+## Ends in an error in state: 350.
+##
+## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit VBAR
+##
+## Ends in an error in state: 349.
+##
+## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
+## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List With
+##
+## Ends in an error in state: 87.
+##
+## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: MINUS With
+##
+## Ends in an error in state: 86.
+##
+## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## MINUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map LBRACKET Unit ARROW Bytes End
+##
+## Ends in an error in state: 362.
+##
+## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map LBRACKET With
+##
+## Ends in an error in state: 360.
+##
+## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes RBRACKET
+##
+## Ends in an error in state: 365.
+##
+## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
+##
+## Ends in an error in state: 234.
+##
+## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
+##
+## Ends in an error in state: 233.
+##
+## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
+## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI With
+##
+## Ends in an error in state: 230.
+##
+## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes VBAR
+##
+## Ends in an error in state: 229.
+##
+## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
+## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW With
+##
+## Ends in an error in state: 227.
+##
+## binding -> expr ARROW . expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit VBAR
+##
+## Ends in an error in state: 226.
+##
+## binding -> expr . ARROW expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map With
+##
+## Ends in an error in state: 85.
+##
+## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Not Bytes With
+##
+## Ends in an error in state: 153.
+##
+## add_expr -> mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Not With
+##
+## Ends in an error in state: 81.
+##
+## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Not
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes RBRACKET
+##
+## Ends in an error in state: 380.
+##
+## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
+##
+## Ends in an error in state: 378.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 377.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
+## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI With
+##
+## Ends in an error in state: 374.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 373.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
+## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ With
+##
+## Ends in an error in state: 80.
+##
+## field_assignment -> Ident EQ . expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## Ident EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident With
+##
+## Ends in an error in state: 79.
+##
+## field_assignment -> Ident . EQ expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record LBRACKET Ident EQ Bytes End
+##
+## Ends in an error in state: 369.
+##
+## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record LBRACKET With
+##
+## Ends in an error in state: 78.
+##
+## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record With
+##
+## Ends in an error in state: 77.
+##
+## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive From
+##
+## Ends in an error in state: 132.
+##
+## fun_expr -> option(Recursive) . Function parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set LBRACKET Unit End
+##
+## Ends in an error in state: 384.
+##
+## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set LBRACKET With
+##
+## Ends in an error in state: 382.
+##
+## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit RBRACKET
+##
+## Ends in an error in state: 387.
+##
+## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set With
+##
+## Ends in an error in state: 76.
+##
+## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit And With
+##
+## Ends in an error in state: 203.
+##
+## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## conj_expr And
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit CAT With
+##
+## Ends in an error in state: 179.
+##
+## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## cons_expr CAT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit COLON
+##
+## Ends in an error in state: 173.
+##
+## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## expr -> disj_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## disj_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit CONS With
+##
+## Ends in an error in state: 186.
+##
+## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr CONS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Contains With
+##
+## Ends in an error in state: 176.
+##
+## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_expr Contains
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit EQ With
+##
+## Ends in an error in state: 199.
+##
+## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit GE With
+##
+## Ends in an error in state: 197.
+##
+## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr GE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit GT With
+##
+## Ends in an error in state: 195.
+##
+## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr GT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit LE With
+##
+## Ends in an error in state: 193.
+##
+## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr LE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit LT With
+##
+## Ends in an error in state: 191.
+##
+## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr LT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit MINUS Unit With
+##
+## Ends in an error in state: 185.
+##
+## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr MINUS mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit MINUS With
+##
+## Ends in an error in state: 184.
+##
+## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr MINUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Mod With
+##
+## Ends in an error in state: 169.
+##
+## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr Mod
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit NE With
+##
+## Ends in an error in state: 189.
+##
+## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr NE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Or With
+##
+## Ends in an error in state: 174.
+##
+## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## disj_expr Or
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit PLUS Unit With
+##
+## Ends in an error in state: 183.
+##
+## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr PLUS mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit PLUS With
+##
+## Ends in an error in state: 182.
+##
+## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr PLUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit SLASH With
+##
+## Ends in an error in state: 167.
+##
+## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr SLASH
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit TIMES With
+##
+## Ends in an error in state: 154.
+##
+## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr TIMES
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit VBAR
+##
+## Ends in an error in state: 573.
+##
+## interactive_expr -> expr . EOF [ # ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit With
+##
+## Ends in an error in state: 175.
+##
+## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: With
+##
+## Ends in an error in state: 571.
+##
+## interactive_expr' -> . interactive_expr [ # ]
+##
+## The known suffix of the stack is as follows:
+##
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes LBRACKET String End
+##
+## Ends in an error in state: 400.
+##
+## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes LBRACKET sep_or_term_list(String,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 392, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 403, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes LBRACKET With
+##
+## Ends in an error in state: 399.
+##
+## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End Attributes String End SEMI With
+##
+## Ends in an error in state: 566.
+##
+## seq(declaration) -> declaration . seq(declaration) [ EOF ]
+##
+## The known suffix of the stack is as follows:
+## declaration
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End SEMI With
+##
+## Ends in an error in state: 564.
+##
+## nseq(declaration) -> declaration . seq(declaration) [ EOF ]
+##
+## The known suffix of the stack is as follows:
+## declaration
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End With
+##
+## Ends in an error in state: 559.
+##
+## attr_decl -> open_attr_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_attr_decl
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String RBRACKET
+##
+## Ends in an error in state: 404.
+##
+## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes sep_or_term_list(String,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 392, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 403, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI String SEMI With
+##
+## Ends in an error in state: 395.
+##
+## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI String With
+##
+## Ends in an error in state: 394.
+##
+## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
+## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI With
+##
+## Ends in an error in state: 393.
+##
+## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String With
+##
+## Ends in an error in state: 392.
+##
+## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
+## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes With
+##
+## Ends in an error in state: 391.
+##
+## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 557.
+##
+## const_decl -> open_const_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_const_decl
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 389, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
+## In state 390, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident EQ With
+##
+## Ends in an error in state: 72.
+##
+## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident VBAR
+##
+## Ends in an error in state: 71.
+##
+## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON With
+##
+## Ends in an error in state: 70.
+##
+## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident With
+##
+## Ends in an error in state: 69.
+##
+## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const With
+##
+## Ends in an error in state: 68.
+##
+## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Const
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET VBAR Block
+##
+## Ends in an error in state: 488.
+##
+## case(if_clause) -> Case expr Of LBRACKET option(VBAR) . cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET option(VBAR)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET WILD ARROW Skip End
+##
+## Ends in an error in state: 516.
+##
+## case(if_clause) -> Case expr Of LBRACKET option(VBAR) cases(if_clause) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET option(VBAR) cases(if_clause)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 518, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 515, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET With
+##
+## Ends in an error in state: 487.
+##
+## case(if_clause) -> Case expr Of LBRACKET . option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of VBAR Block
+##
+## Ends in an error in state: 521.
+##
+## case(if_clause) -> Case expr Of option(VBAR) . cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of option(VBAR)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip RBRACKET
+##
+## Ends in an error in state: 522.
+##
+## case(if_clause) -> Case expr Of option(VBAR) cases(if_clause) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of option(VBAR) cases(if_clause)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 518, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 515, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip VBAR With
+##
+## Ends in an error in state: 519.
+##
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) VBAR . nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## case_clause(if_clause) VBAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip With
+##
+## Ends in an error in state: 518.
+##
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . [ RBRACKET End ]
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . VBAR nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## case_clause(if_clause)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW With
+##
+## Ends in an error in state: 490.
+##
+## case_clause(if_clause) -> pattern ARROW . if_clause [ VBAR RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## pattern ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD RPAR
+##
+## Ends in an error in state: 489.
+##
+## case_clause(if_clause) -> pattern . ARROW if_clause [ VBAR RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## pattern
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 278, spurious reduction of production pattern -> core_pattern 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of With
+##
+## Ends in an error in state: 486.
+##
+## case(if_clause) -> Case expr Of . option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case expr Of . LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit VBAR
+##
+## Ends in an error in state: 485.
+##
+## case(if_clause) -> Case expr . Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case expr . Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case With
+##
+## Ends in an error in state: 484.
+##
+## case(if_clause) -> Case . expr Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case . expr Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW Ident With
+##
+## Ends in an error in state: 471.
+##
+## for_loop -> For Ident option(arrow_clause) . In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW With
+##
+## Ends in an error in state: 469.
+##
+## arrow_clause -> ARROW . Ident [ In ]
+##
+## The known suffix of the stack is as follows:
+## ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To Unit VBAR
+##
+## Ends in an error in state: 482.
+##
+## for_loop -> For var_assign To expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign To expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To With
+##
+## Ends in an error in state: 481.
+##
+## for_loop -> For var_assign To . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign To
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes VBAR
+##
+## Ends in an error in state: 480.
+##
+## for_loop -> For var_assign . To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 468, spurious reduction of production var_assign -> Ident ASS expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS With
+##
+## Ends in an error in state: 467.
+##
+## var_assign -> Ident ASS . expr [ To ]
+##
+## The known suffix of the stack is as follows:
+## Ident ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set Unit VBAR
+##
+## Ends in an error in state: 477.
+##
+## for_loop -> For Ident option(arrow_clause) In collection expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In collection expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set With
+##
+## Ends in an error in state: 476.
+##
+## for_loop -> For Ident option(arrow_clause) In collection . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In collection
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In With
+##
+## Ends in an error in state: 472.
+##
+## for_loop -> For Ident option(arrow_clause) In . collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident With
+##
+## Ends in an error in state: 466.
+##
+## for_loop -> For Ident . option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+## var_assign -> Ident . ASS expr [ To ]
+##
+## The known suffix of the stack is as follows:
+## For Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For With
+##
+## Ends in an error in state: 465.
+##
+## for_loop -> For . var_assign To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+## for_loop -> For . Ident option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident ASS With
+##
+## Ends in an error in state: 502.
+##
+## assignment -> lhs ASS . rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## lhs ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident DOT Ident With
+##
+## Ends in an error in state: 496.
+##
+## lhs -> path . [ ASS ]
+## map_lookup -> path . brackets(expr) [ ASS ]
+##
+## The known suffix of the stack is as follows:
+## path
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 322, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 325, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 432, spurious reduction of production path -> projection 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident LBRACKET Bytes RBRACKET With
+##
+## Ends in an error in state: 501.
+##
+## assignment -> lhs . ASS rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## lhs
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident With
+##
+## Ends in an error in state: 464.
+##
+## fun_call -> Ident . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
+## path -> Ident . [ LBRACKET ASS ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE Skip End
+##
+## Ends in an error in state: 538.
+##
+## clause_block -> LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## LBRACE sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE With
+##
+## Ends in an error in state: 463.
+##
+## clause_block -> LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## LBRACE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip Else With
+##
+## Ends in an error in state: 544.
+##
+## conditional -> If expr Then if_clause option(SEMI) Else . if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause option(SEMI) Else
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip SEMI EQ
+##
+## Ends in an error in state: 543.
+##
+## conditional -> If expr Then if_clause option(SEMI) . Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause option(SEMI)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip With
+##
+## Ends in an error in state: 542.
+##
+## conditional -> If expr Then if_clause . option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then With
+##
+## Ends in an error in state: 462.
+##
+## conditional -> If expr Then . if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit VBAR
+##
+## Ends in an error in state: 461.
+##
+## conditional -> If expr . Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If With
+##
+## Ends in an error in state: 460.
+##
+## conditional -> If . expr Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident VBAR
+##
+## Ends in an error in state: 437.
+##
+## map_patch -> Patch path . With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch path . With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch path . With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch path
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 431, spurious reduction of production path -> Ident 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident While
+##
+## Ends in an error in state: 431.
+##
+## path -> Ident . [ With VBAR SEMI RBRACKET RBRACE End Else ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET Unit ARROW Bytes End
+##
+## Ends in an error in state: 453.
+##
+## ne_injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET With
+##
+## Ends in an error in state: 452.
+##
+## ne_injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map Unit ARROW Bytes RBRACKET
+##
+## Ends in an error in state: 455.
+##
+## ne_injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 228, spurious reduction of production binding -> expr ARROW expr 
+## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map With
+##
+## Ends in an error in state: 451.
+##
+## ne_injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record Ident EQ Bytes RBRACKET
+##
+## Ends in an error in state: 449.
+##
+## ne_injection(Record,field_assignment) -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET Ident EQ Bytes End
+##
+## Ends in an error in state: 447.
+##
+## ne_injection(Record,field_assignment) -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET With
+##
+## Ends in an error in state: 446.
+##
+## ne_injection(Record,field_assignment) -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record With
+##
+## Ends in an error in state: 445.
+##
+## ne_injection(Record,field_assignment) -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Record,field_assignment) -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET Unit End
+##
+## Ends in an error in state: 441.
+##
+## ne_injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET With
+##
+## Ends in an error in state: 440.
+##
+## ne_injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set Unit RBRACKET
+##
+## Ends in an error in state: 443.
+##
+## ne_injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set With
+##
+## Ends in an error in state: 439.
+##
+## ne_injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With With
+##
+## Ends in an error in state: 438.
+##
+## map_patch -> Patch path With . ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch path With . ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch path With . ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch path With
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch With
+##
+## Ends in an error in state: 436.
+##
+## map_patch -> Patch . path With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch . path With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch . path With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Map With
+##
+## Ends in an error in state: 434.
+##
+## map_remove -> Remove expr From Map . path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Set With
+##
+## Ends in an error in state: 430.
+##
+## set_remove -> Remove expr From Set . path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From With
+##
+## Ends in an error in state: 429.
+##
+## map_remove -> Remove expr From . Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove expr From . Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit VBAR
+##
+## Ends in an error in state: 428.
+##
+## map_remove -> Remove expr . From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove expr . From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove With
+##
+## Ends in an error in state: 427.
+##
+## map_remove -> Remove . expr From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove . expr From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
+##
+## Ends in an error in state: 552.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters COLON type_expr Is block
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
+##
+## Ends in an error in state: 553.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters COLON type_expr Is block With
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip RBRACE
+##
+## Ends in an error in state: 546.
+##
+## block -> Begin sep_or_term_list(statement,SEMI) . End [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Begin sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip SEMI With
+##
+## Ends in an error in state: 527.
+##
+## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
+## seq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip With
+##
+## Ends in an error in state: 526.
+##
+## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
+## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
+## seq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI With
+##
+## Ends in an error in state: 525.
+##
+## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
+## nseq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip With
+##
+## Ends in an error in state: 524.
+##
+## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
+## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
+## nseq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident ASS With
+##
+## Ends in an error in state: 423.
+##
+## unqualified_decl(ASS) -> Ident COLON type_expr ASS . expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident VBAR
+##
+## Ends in an error in state: 422.
+##
+## unqualified_decl(ASS) -> Ident COLON type_expr . ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON With
+##
+## Ends in an error in state: 421.
+##
+## unqualified_decl(ASS) -> Ident COLON . type_expr ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident With
+##
+## Ends in an error in state: 420.
+##
+## unqualified_decl(ASS) -> Ident . COLON type_expr ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var With
+##
+## Ends in an error in state: 419.
+##
+## open_var_decl -> Var . unqualified_decl(ASS) [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Var
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While Unit VBAR
+##
+## Ends in an error in state: 417.
+##
+## while_loop -> While expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## While expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While With
+##
+## Ends in an error in state: 416.
+##
+## while_loop -> While . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## While
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin With
+##
+## Ends in an error in state: 418.
+##
+## block -> Begin . sep_or_term_list(statement,SEMI) End [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Begin
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE Skip End
+##
+## Ends in an error in state: 549.
+##
+## block -> Block LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block LBRACE sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE With
+##
+## Ends in an error in state: 415.
+##
+## block -> Block LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block LBRACE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block With
+##
+## Ends in an error in state: 414.
+##
+## block -> Block . LBRACE sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes VBAR
+##
+## Ends in an error in state: 555.
+##
+## fun_decl -> open_fun_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_fun_decl
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 175, spurious reduction of production unary_expr -> core_expr 
+## In state 106, spurious reduction of production mult_expr -> unary_expr 
+## In state 153, spurious reduction of production add_expr -> mult_expr 
+## In state 181, spurious reduction of production cons_expr -> add_expr 
+## In state 178, spurious reduction of production cat_expr -> cons_expr 
+## In state 201, spurious reduction of production comp_expr -> cat_expr 
+## In state 188, spurious reduction of production set_membership -> comp_expr 
+## In state 108, spurious reduction of production conj_expr -> set_membership 
+## In state 205, spurious reduction of production disj_expr -> conj_expr 
+## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 551, spurious reduction of production open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
+##
+## Ends in an error in state: 413.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters COLON type_expr Is
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
+##
+## Ends in an error in state: 412.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr . Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
+##
+## Ends in an error in state: 411.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function Ident parameters COLON . type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR With
+##
+## Ends in an error in state: 410.
+##
+## open_fun_decl -> option(Recursive) Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function Ident parameters . COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident parameters
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident With
+##
+## Ends in an error in state: 409.
+##
+## open_fun_decl -> option(Recursive) Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function Ident . parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function With
+##
+## Ends in an error in state: 408.
+##
+## open_fun_decl -> option(Recursive) Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) Function . Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive) Function
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive With
+##
+## Ends in an error in state: 407.
+##
+## open_fun_decl -> option(Recursive) . Function Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> option(Recursive) . Function Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## option(Recursive)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident VBAR
+##
+## Ends in an error in state: 64.
+##
+## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Type Ident Is type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 contract: Type Ident Is With
 ##
 ## Ends in an error in state: 3.
 ##
-## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident Is
@@ -4583,7 +4494,7 @@ contract: Type Ident With
 ##
 ## Ends in an error in state: 2.
 ##
-## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident
@@ -4595,7 +4506,7 @@ contract: Type With
 ##
 ## Ends in an error in state: 1.
 ##
-## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type
diff --git a/src/passes/1-parser/reasonligo/error.messages.checked-in b/src/passes/1-parser/reasonligo/error.messages.checked-in
index f86688e86..9b107c412 100644
--- a/src/passes/1-parser/reasonligo/error.messages.checked-in
+++ b/src/passes/1-parser/reasonligo/error.messages.checked-in
@@ -185,7 +185,7 @@ interactive_expr: If LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 402.
+## Ends in an error in state: 406.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -211,16 +211,16 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True ARROW
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 400, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 411, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 410, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 407.
+## Ends in an error in state: 411.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if . option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -246,16 +246,16 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 400, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 411, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 410, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 408.
+## Ends in an error in state: 412.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) . RBRACE [ SEMI RBRACE ]
 ##
@@ -267,7 +267,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 406.
+## Ends in an error in state: 410.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -279,7 +279,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 405.
+## Ends in an error in state: 409.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -291,7 +291,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 404.
+## Ends in an error in state: 408.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -303,7 +303,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 403.
+## Ends in an error in state: 407.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -363,7 +363,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR VBAR
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 431.
+## Ends in an error in state: 435.
 ##
 ## nseq(case_clause(base_if_then_else)) -> case_clause(base_if_then_else) . seq(case_clause(base_if_then_else)) [ RBRACE ]
 ##
@@ -375,7 +375,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW By
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 433.
+## Ends in an error in state: 437.
 ##
 ## seq(case_clause(base_if_then_else)) -> case_clause(base_if_then_else) . seq(case_clause(base_if_then_else)) [ RBRACE ]
 ##
@@ -387,7 +387,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW By
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 412.
+## Ends in an error in state: 416.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -413,16 +413,16 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 400, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 411, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 410, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 422.
+## Ends in an error in state: 426.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) . RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -434,7 +434,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ##
-## Ends in an error in state: 421.
+## Ends in an error in state: 425.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else . option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -455,16 +455,16 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 ## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
 ## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
 ## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 419, spurious reduction of production base_expr(base_if_then_else) -> disj_expr_level 
-## In state 424, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
-## In state 420, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
+## In state 423, spurious reduction of production base_expr(base_if_then_else) -> disj_expr_level 
+## In state 428, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
+## In state 424, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 416.
+## Ends in an error in state: 420.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -476,7 +476,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 415.
+## Ends in an error in state: 419.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -488,7 +488,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 414.
+## Ends in an error in state: 418.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -500,7 +500,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 413.
+## Ends in an error in state: 417.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -548,7 +548,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ##
-## Ends in an error in state: 425.
+## Ends in an error in state: 429.
 ##
 ## case_clause(base_if_then_else) -> VBAR pattern ARROW base_if_then_else . option(SEMI) [ VBAR RBRACE ]
 ##
@@ -574,16 +574,16 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Tr
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 418, spurious reduction of production base_expr(base_if_then_else) -> fun_expr 
-## In state 424, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
-## In state 420, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
+## In state 422, spurious reduction of production base_expr(base_if_then_else) -> fun_expr 
+## In state 428, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
+## In state 424, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW True Type
 ##
-## Ends in an error in state: 419.
+## Ends in an error in state: 423.
 ##
 ## base_expr(base_if_then_else) -> disj_expr_level . [ VBAR SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ VBAR SEMI RBRACE Or BOOL_OR ARROW ]
@@ -681,7 +681,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 439.
+## Ends in an error in state: 443.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -708,16 +708,16 @@ interactive_expr: If LPAR True RPAR LBRACE True ARROW Bytes VBAR
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 400, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 411, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 410, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 445.
+## Ends in an error in state: 449.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) . RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -729,7 +729,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True SEMI PLU
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ##
-## Ends in an error in state: 444.
+## Ends in an error in state: 448.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr . option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -753,14 +753,14 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 397, spurious reduction of production expr_with_let_expr -> expr 
+## In state 398, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 443.
+## Ends in an error in state: 447.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -772,7 +772,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 442.
+## Ends in an error in state: 446.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -784,7 +784,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 441.
+## Ends in an error in state: 445.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -797,7 +797,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 440.
+## Ends in an error in state: 444.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -810,7 +810,7 @@ interactive_expr: If LPAR True RPAR LBRACE True SEMI PLUS
 
 interactive_expr: If LPAR True RPAR LBRACE True VBAR
 ##
-## Ends in an error in state: 401.
+## Ends in an error in state: 405.
 ##
 ## base_expr(closed_if) -> disj_expr_level . [ SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ SEMI RBRACE Or BOOL_OR ARROW ]
@@ -1157,7 +1157,7 @@ interactive_expr: LBRACE ELLIPSIS WILD
 
 interactive_expr: LBRACE Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 462.
+## Ends in an error in state: 466.
 ##
 ## sequence_or_record_in -> field_assignment . COMMA sep_or_term_list(field_assignment,COMMA) [ RBRACE ]
 ##
@@ -1181,14 +1181,14 @@ interactive_expr: LBRACE Ident COLON Bytes VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 459, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COLON WILD
 ##
-## Ends in an error in state: 458.
+## Ends in an error in state: 462.
 ##
 ## field_assignment -> Ident COLON . expr [ RBRACE COMMA ]
 ##
@@ -1200,7 +1200,7 @@ interactive_expr: LBRACE Ident COLON WILD
 
 interactive_expr: LBRACE Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 468.
+## Ends in an error in state: 472.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,COMMA) -> field_assignment . COMMA nsepseq(field_assignment,COMMA) [ RBRACE ]
@@ -1226,14 +1226,14 @@ interactive_expr: LBRACE Ident COMMA Ident COLON Bytes VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 459, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 472.
+## Ends in an error in state: 476.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,COMMA) -> field_assignment . COMMA nsepseq(field_assignment,COMMA) [ RBRACE ]
@@ -1259,14 +1259,14 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 459, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 473.
+## Ends in an error in state: 477.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment COMMA . nsepseq(field_assignment,COMMA) [ RBRACE ]
 ## seq(__anonymous_0(field_assignment,COMMA)) -> field_assignment COMMA . seq(__anonymous_0(field_assignment,COMMA)) [ RBRACE ]
@@ -1279,7 +1279,7 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 469.
+## Ends in an error in state: 473.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment COMMA . nsepseq(field_assignment,COMMA) [ RBRACE ]
 ## nseq(__anonymous_0(field_assignment,COMMA)) -> field_assignment COMMA . seq(__anonymous_0(field_assignment,COMMA)) [ RBRACE ]
@@ -1292,7 +1292,7 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE Ident COMMA Ident WILD
 ##
-## Ends in an error in state: 464.
+## Ends in an error in state: 468.
 ##
 ## field_assignment -> Ident . [ RBRACE COMMA ]
 ## field_assignment -> Ident . COLON expr [ RBRACE COMMA ]
@@ -1305,7 +1305,7 @@ interactive_expr: LBRACE Ident COMMA Ident WILD
 
 interactive_expr: LBRACE Ident COMMA WILD
 ##
-## Ends in an error in state: 463.
+## Ends in an error in state: 467.
 ##
 ## sequence_or_record_in -> field_assignment COMMA . sep_or_term_list(field_assignment,COMMA) [ RBRACE ]
 ##
@@ -1317,7 +1317,7 @@ interactive_expr: LBRACE Ident COMMA WILD
 
 interactive_expr: LBRACE Ident WILD
 ##
-## Ends in an error in state: 457.
+## Ends in an error in state: 461.
 ##
 ## common_expr -> Ident . [ TIMES SLASH SEMI RBRACE PLUS Or NE Mod MINUS LT LPAR LE GT GE EQEQ COLON CAT BOOL_OR BOOL_AND ARROW ]
 ## field_assignment -> Ident . [ COMMA ]
@@ -1332,7 +1332,7 @@ interactive_expr: LBRACE Ident WILD
 
 interactive_expr: LBRACE True SEMI True SEMI True SEMI WILD
 ##
-## Ends in an error in state: 485.
+## Ends in an error in state: 489.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr SEMI . nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(expr_with_let_expr,SEMI)) -> expr_with_let_expr SEMI . seq(__anonymous_0(expr_with_let_expr,SEMI)) [ RBRACE ]
@@ -1345,7 +1345,7 @@ interactive_expr: LBRACE True SEMI True SEMI True SEMI WILD
 
 interactive_expr: LBRACE True SEMI True SEMI True VBAR
 ##
-## Ends in an error in state: 484.
+## Ends in an error in state: 488.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . [ RBRACE ]
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . SEMI nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1371,14 +1371,14 @@ interactive_expr: LBRACE True SEMI True SEMI True VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 397, spurious reduction of production expr_with_let_expr -> expr 
+## In state 398, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE True SEMI True SEMI WILD
 ##
-## Ends in an error in state: 481.
+## Ends in an error in state: 485.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr SEMI . nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(expr_with_let_expr,SEMI)) -> expr_with_let_expr SEMI . seq(__anonymous_0(expr_with_let_expr,SEMI)) [ RBRACE ]
@@ -1391,7 +1391,7 @@ interactive_expr: LBRACE True SEMI True SEMI WILD
 
 interactive_expr: LBRACE True SEMI True VBAR
 ##
-## Ends in an error in state: 480.
+## Ends in an error in state: 484.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . [ RBRACE ]
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . SEMI nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1417,14 +1417,14 @@ interactive_expr: LBRACE True SEMI True VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 397, spurious reduction of production expr_with_let_expr -> expr 
+## In state 398, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE True SEMI WILD
 ##
-## Ends in an error in state: 476.
+## Ends in an error in state: 480.
 ##
 ## option(SEMI) -> SEMI . [ RBRACE ]
 ## sequence_or_record_in -> expr_with_let_expr SEMI . sep_or_term_list(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1437,7 +1437,7 @@ interactive_expr: LBRACE True SEMI WILD
 
 interactive_expr: LBRACE True VBAR
 ##
-## Ends in an error in state: 475.
+## Ends in an error in state: 479.
 ##
 ## sequence_or_record_in -> expr_with_let_expr . SEMI sep_or_term_list(expr_with_let_expr,SEMI) [ RBRACE ]
 ## sequence_or_record_in -> expr_with_let_expr . option(SEMI) [ RBRACE ]
@@ -1462,7 +1462,7 @@ interactive_expr: LBRACE True VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 397, spurious reduction of production expr_with_let_expr -> expr 
+## In state 398, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1482,7 +1482,7 @@ interactive_expr: LBRACE WILD
 
 interactive_expr: LBRACKET True COMMA ELLIPSIS True VBAR
 ##
-## Ends in an error in state: 494.
+## Ends in an error in state: 498.
 ##
 ## list_or_spread -> LBRACKET expr COMMA ELLIPSIS expr . RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1512,7 +1512,7 @@ interactive_expr: LBRACKET True COMMA ELLIPSIS True VBAR
 
 interactive_expr: LBRACKET True COMMA ELLIPSIS WILD
 ##
-## Ends in an error in state: 493.
+## Ends in an error in state: 497.
 ##
 ## list_or_spread -> LBRACKET expr COMMA ELLIPSIS . expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1524,7 +1524,7 @@ interactive_expr: LBRACKET True COMMA ELLIPSIS WILD
 
 interactive_expr: LBRACKET True COMMA True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 504.
+## Ends in an error in state: 508.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RBRACKET ]
 ## seq(__anonymous_0(expr,COMMA)) -> expr COMMA . seq(__anonymous_0(expr,COMMA)) [ RBRACKET ]
@@ -1537,7 +1537,7 @@ interactive_expr: LBRACKET True COMMA True COMMA True COMMA WILD
 
 interactive_expr: LBRACKET True COMMA True COMMA True VBAR
 ##
-## Ends in an error in state: 503.
+## Ends in an error in state: 507.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RBRACKET ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RBRACKET ]
@@ -1569,7 +1569,7 @@ interactive_expr: LBRACKET True COMMA True COMMA True VBAR
 
 interactive_expr: LBRACKET True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 501.
+## Ends in an error in state: 505.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RBRACKET ]
 ## nseq(__anonymous_0(expr,COMMA)) -> expr COMMA . seq(__anonymous_0(expr,COMMA)) [ RBRACKET ]
@@ -1582,7 +1582,7 @@ interactive_expr: LBRACKET True COMMA True COMMA WILD
 
 interactive_expr: LBRACKET True COMMA True VBAR
 ##
-## Ends in an error in state: 500.
+## Ends in an error in state: 504.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RBRACKET ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RBRACKET ]
@@ -1614,7 +1614,7 @@ interactive_expr: LBRACKET True COMMA True VBAR
 
 interactive_expr: LBRACKET True COMMA WILD
 ##
-## Ends in an error in state: 492.
+## Ends in an error in state: 496.
 ##
 ## list_or_spread -> LBRACKET expr COMMA . sep_or_term_list(expr,COMMA) RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## list_or_spread -> LBRACKET expr COMMA . ELLIPSIS expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -1627,7 +1627,7 @@ interactive_expr: LBRACKET True COMMA WILD
 
 interactive_expr: LBRACKET True VBAR
 ##
-## Ends in an error in state: 491.
+## Ends in an error in state: 495.
 ##
 ## list_or_spread -> LBRACKET expr . COMMA sep_or_term_list(expr,COMMA) RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## list_or_spread -> LBRACKET expr . COMMA ELLIPSIS expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -1710,7 +1710,7 @@ interactive_expr: LPAR True COMMA Bytes RPAR WILD
 
 interactive_expr: LPAR True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 455.
+## Ends in an error in state: 459.
 ##
 ## nsepseq(disj_expr_level,COMMA) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ RPAR ]
 ##
@@ -1722,7 +1722,7 @@ interactive_expr: LPAR True COMMA True COMMA WILD
 
 interactive_expr: LPAR True COMMA True VBAR
 ##
-## Ends in an error in state: 454.
+## Ends in an error in state: 458.
 ##
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ RPAR Or COMMA BOOL_OR ]
 ## bin_op(disj_expr_level,Or,conj_expr_level) -> disj_expr_level . Or conj_expr_level [ RPAR Or COMMA BOOL_OR ]
@@ -1752,7 +1752,7 @@ interactive_expr: LPAR True COMMA True VBAR
 
 interactive_expr: LPAR True COMMA WILD
 ##
-## Ends in an error in state: 452.
+## Ends in an error in state: 456.
 ##
 ## tuple(disj_expr_level) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ RPAR ]
 ##
@@ -1764,7 +1764,7 @@ interactive_expr: LPAR True COMMA WILD
 
 interactive_expr: LPAR True VBAR
 ##
-## Ends in an error in state: 451.
+## Ends in an error in state: 455.
 ##
 ## base_expr(expr) -> disj_expr_level . [ RPAR ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ RPAR Or COMMA BOOL_OR ARROW ]
@@ -1807,11 +1807,67 @@ interactive_expr: LPAR WILD
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Let Rec VBAR
+##
+## Ends in an error in state: 352.
+##
+## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec . let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
+##
+## The known suffix of the stack is as follows:
+## seq(Attr) Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Let Rec WILD EQ Bytes SEMI WILD
+##
+## Ends in an error in state: 395.
+##
+## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec let_binding SEMI . expr_with_let_expr [ SEMI RBRACE EOF ]
+##
+## The known suffix of the stack is as follows:
+## seq(Attr) Let Rec let_binding SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Let Rec WILD EQ Bytes VBAR
+##
+## Ends in an error in state: 394.
+##
+## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec let_binding . SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
+##
+## The known suffix of the stack is as follows:
+## seq(Attr) Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 170, spurious reduction of production option(type_annotation_simple) -> 
+## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Let VBAR
 ##
 ## Ends in an error in state: 351.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let . let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
+## let_expr(expr_with_let_expr) -> seq(Attr) Let . Rec let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
 ## The known suffix of the stack is as follows:
 ## seq(Attr) Let
@@ -1821,7 +1877,7 @@ interactive_expr: Let VBAR
 
 interactive_expr: Let WILD EQ Bytes SEMI WILD
 ##
-## Ends in an error in state: 394.
+## Ends in an error in state: 400.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let let_binding SEMI . expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1833,7 +1889,7 @@ interactive_expr: Let WILD EQ Bytes SEMI WILD
 
 interactive_expr: Let WILD EQ Bytes VBAR
 ##
-## Ends in an error in state: 393.
+## Ends in an error in state: 399.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let let_binding . SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1857,7 +1913,7 @@ interactive_expr: Let WILD EQ Bytes VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 526, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -2015,7 +2071,7 @@ interactive_expr: Switch LBRACKET WILD
 
 interactive_expr: Switch LPAR True VBAR
 ##
-## Ends in an error in state: 449.
+## Ends in an error in state: 453.
 ##
 ## par(expr) -> LPAR expr . RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2134,7 +2190,7 @@ interactive_expr: Switch True LBRACE VBAR LPAR Bytes RPAR WILD
 
 interactive_expr: Switch True LBRACE VBAR VBAR
 ##
-## Ends in an error in state: 509.
+## Ends in an error in state: 513.
 ##
 ## case_clause(base_cond) -> VBAR . pattern ARROW base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2146,7 +2202,7 @@ interactive_expr: Switch True LBRACE VBAR VBAR
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 522.
+## Ends in an error in state: 526.
 ##
 ## nseq(case_clause(base_cond)) -> case_clause(base_cond) . seq(case_clause(base_cond)) [ RBRACE ]
 ##
@@ -2158,7 +2214,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 524.
+## Ends in an error in state: 528.
 ##
 ## seq(case_clause(base_cond)) -> case_clause(base_cond) . seq(case_clause(base_cond)) [ RBRACE ]
 ##
@@ -2170,7 +2226,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Byte
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ##
-## Ends in an error in state: 517.
+## Ends in an error in state: 521.
 ##
 ## case_clause(base_cond) -> VBAR pattern ARROW base_cond . option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2196,16 +2252,16 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
 ## In state 213, spurious reduction of production es6_func -> ARROW expr 
 ## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 512, spurious reduction of production base_expr(base_cond) -> fun_expr 
-## In state 515, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 516, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 516, spurious reduction of production base_expr(base_cond) -> fun_expr 
+## In state 519, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 520, spurious reduction of production base_cond -> base_cond__open(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW True Type
 ##
-## Ends in an error in state: 513.
+## Ends in an error in state: 517.
 ##
 ## base_expr(base_cond) -> disj_expr_level . [ VBAR SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ VBAR SEMI RBRACE Or BOOL_OR ARROW ]
@@ -2235,7 +2291,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW True Type
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW WILD
 ##
-## Ends in an error in state: 511.
+## Ends in an error in state: 515.
 ##
 ## case_clause(base_cond) -> VBAR pattern ARROW . base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2247,7 +2303,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD COMMA Bytes RPAR
 ##
-## Ends in an error in state: 510.
+## Ends in an error in state: 514.
 ##
 ## case_clause(base_cond) -> VBAR pattern . ARROW base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2304,7 +2360,7 @@ interactive_expr: Switch True LBRACE VBAR WILD COMMA WILD WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD WILD
 ##
-## Ends in an error in state: 427.
+## Ends in an error in state: 431.
 ##
 ## pattern -> core_pattern . [ ARROW ]
 ## sub_pattern -> core_pattern . [ COMMA ]
@@ -2317,7 +2373,7 @@ interactive_expr: Switch True LBRACE VBAR WILD WILD
 
 interactive_expr: Switch True LBRACE WILD
 ##
-## Ends in an error in state: 508.
+## Ends in an error in state: 512.
 ##
 ## switch_expr(base_cond) -> Switch switch_expr_ LBRACE . cases(base_cond) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -2329,7 +2385,7 @@ interactive_expr: Switch True LBRACE WILD
 
 interactive_expr: Switch True WILD
 ##
-## Ends in an error in state: 507.
+## Ends in an error in state: 511.
 ##
 ## switch_expr(base_cond) -> Switch switch_expr_ . LBRACE cases(base_cond) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -2779,7 +2835,7 @@ interactive_expr: True TIMES WILD
 
 interactive_expr: True VBAR
 ##
-## Ends in an error in state: 537.
+## Ends in an error in state: 541.
 ##
 ## interactive_expr -> expr_with_let_expr . EOF [ # ]
 ##
@@ -2803,7 +2859,7 @@ interactive_expr: True VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 397, spurious reduction of production expr_with_let_expr -> expr 
+## In state 398, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -2824,7 +2880,7 @@ interactive_expr: True WILD
 
 interactive_expr: WILD
 ##
-## Ends in an error in state: 535.
+## Ends in an error in state: 539.
 ##
 ## interactive_expr' -> . interactive_expr [ # ]
 ##
@@ -2848,7 +2904,7 @@ contract: Attr WILD
 
 contract: Let Ident COLON Constr Type
 ##
-## Ends in an error in state: 373.
+## Ends in an error in state: 374.
 ##
 ## let_binding -> Ident option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2871,7 +2927,7 @@ contract: Let Ident COLON Constr Type
 
 contract: Let Ident EQ WILD
 ##
-## Ends in an error in state: 374.
+## Ends in an error in state: 375.
 ##
 ## let_binding -> Ident option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2888,7 +2944,7 @@ let func = (a: int, b: int) => a + b;
 
 contract: Let Ident WILD
 ##
-## Ends in an error in state: 372.
+## Ends in an error in state: 373.
 ##
 ## let_binding -> Ident . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> Ident . [ COMMA ]
@@ -2941,7 +2997,7 @@ contract: Let LBRACE Ident EQ Bytes COMMA WILD
 
 contract: Let LBRACE Ident EQ Bytes RBRACE COLON Constr Type
 ##
-## Ends in an error in state: 386.
+## Ends in an error in state: 387.
 ##
 ## let_binding -> record_pattern option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2964,7 +3020,7 @@ contract: Let LBRACE Ident EQ Bytes RBRACE COLON Constr Type
 
 contract: Let LBRACE Ident EQ Bytes RBRACE EQ WILD
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 388.
 ##
 ## let_binding -> record_pattern option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2976,7 +3032,7 @@ contract: Let LBRACE Ident EQ Bytes RBRACE EQ WILD
 
 contract: Let LBRACE Ident EQ Bytes RBRACE WILD
 ##
-## Ends in an error in state: 385.
+## Ends in an error in state: 386.
 ##
 ## let_binding -> record_pattern . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> record_pattern . [ COMMA ]
@@ -3164,7 +3220,7 @@ contract: Let LPAR Constr LPAR WILD WILD
 
 contract: Let LPAR Constr SEMI
 ##
-## Ends in an error in state: 370.
+## Ends in an error in state: 371.
 ##
 ## par(closed_irrefutable) -> LPAR closed_irrefutable . RPAR [ RPAR EQ COMMA COLON ]
 ##
@@ -3176,7 +3232,7 @@ contract: Let LPAR Constr SEMI
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
 ## In state 286, spurious reduction of production constr_pattern -> Constr 
-## In state 369, spurious reduction of production closed_irrefutable -> constr_pattern 
+## In state 370, spurious reduction of production closed_irrefutable -> constr_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -3196,7 +3252,7 @@ contract: Let LPAR Constr VBAR
 
 contract: Let LPAR RPAR COLON Constr Type
 ##
-## Ends in an error in state: 377.
+## Ends in an error in state: 378.
 ##
 ## let_binding -> unit option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3219,7 +3275,7 @@ contract: Let LPAR RPAR COLON Constr Type
 
 contract: Let LPAR RPAR EQ WILD
 ##
-## Ends in an error in state: 378.
+## Ends in an error in state: 379.
 ##
 ## let_binding -> unit option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3231,7 +3287,7 @@ contract: Let LPAR RPAR EQ WILD
 
 contract: Let LPAR RPAR WILD
 ##
-## Ends in an error in state: 376.
+## Ends in an error in state: 377.
 ##
 ## let_binding -> unit . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> unit . [ COMMA ]
@@ -3244,7 +3300,7 @@ contract: Let LPAR RPAR WILD
 
 contract: Let LPAR VBAR
 ##
-## Ends in an error in state: 352.
+## Ends in an error in state: 353.
 ##
 ## par(closed_irrefutable) -> LPAR . closed_irrefutable RPAR [ RPAR EQ COMMA COLON ]
 ## unit -> LPAR . RPAR [ RPAR EQ COMMA COLON ]
@@ -3257,7 +3313,7 @@ contract: Let LPAR VBAR
 
 contract: Let LPAR WILD COLON WILD
 ##
-## Ends in an error in state: 367.
+## Ends in an error in state: 368.
 ##
 ## typed_pattern -> irrefutable COLON . type_expr [ RPAR ]
 ##
@@ -3269,7 +3325,7 @@ contract: Let LPAR WILD COLON WILD
 
 contract: Let LPAR WILD COMMA Ident EQ
 ##
-## Ends in an error in state: 366.
+## Ends in an error in state: 367.
 ##
 ## closed_irrefutable -> irrefutable . [ RPAR ]
 ## typed_pattern -> irrefutable . COLON type_expr [ RPAR ]
@@ -3281,16 +3337,16 @@ contract: Let LPAR WILD COMMA Ident EQ
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 360, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
-## In state 365, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
-## In state 357, spurious reduction of production irrefutable -> tuple(sub_irrefutable) 
+## In state 361, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
+## In state 366, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
+## In state 358, spurious reduction of production irrefutable -> tuple(sub_irrefutable) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR WILD RPAR COLON Constr Type
 ##
-## Ends in an error in state: 390.
+## Ends in an error in state: 391.
 ##
 ## let_binding -> par(closed_irrefutable) option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3313,7 +3369,7 @@ contract: Let LPAR WILD RPAR COLON Constr Type
 
 contract: Let LPAR WILD RPAR EQ WILD
 ##
-## Ends in an error in state: 391.
+## Ends in an error in state: 392.
 ##
 ## let_binding -> par(closed_irrefutable) option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3325,7 +3381,7 @@ contract: Let LPAR WILD RPAR EQ WILD
 
 contract: Let LPAR WILD RPAR WILD
 ##
-## Ends in an error in state: 389.
+## Ends in an error in state: 390.
 ##
 ## let_binding -> par(closed_irrefutable) . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> par(closed_irrefutable) . [ COMMA ]
@@ -3338,7 +3394,7 @@ contract: Let LPAR WILD RPAR WILD
 
 contract: Let LPAR WILD WILD
 ##
-## Ends in an error in state: 358.
+## Ends in an error in state: 359.
 ##
 ## irrefutable -> sub_irrefutable . [ RPAR COLON ]
 ## tuple(sub_irrefutable) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ RPAR COLON ]
@@ -3397,7 +3453,7 @@ contract: Let WILD COLON WILD
 
 contract: Let WILD COMMA Ident COLON Constr Type
 ##
-## Ends in an error in state: 381.
+## Ends in an error in state: 382.
 ##
 ## let_binding -> tuple(sub_irrefutable) option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3420,7 +3476,7 @@ contract: Let WILD COMMA Ident COLON Constr Type
 
 contract: Let WILD COMMA Ident EQ WILD
 ##
-## Ends in an error in state: 382.
+## Ends in an error in state: 383.
 ##
 ## let_binding -> tuple(sub_irrefutable) option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3432,7 +3488,7 @@ contract: Let WILD COMMA Ident EQ WILD
 
 contract: Let WILD COMMA Ident RPAR
 ##
-## Ends in an error in state: 380.
+## Ends in an error in state: 381.
 ##
 ## let_binding -> tuple(sub_irrefutable) . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3443,15 +3499,15 @@ contract: Let WILD COMMA Ident RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 360, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
-## In state 365, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
+## In state 361, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
+## In state 366, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD COMMA VBAR
 ##
-## Ends in an error in state: 359.
+## Ends in an error in state: 360.
 ##
 ## tuple(sub_irrefutable) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
 ##
@@ -3463,7 +3519,7 @@ contract: Let WILD COMMA VBAR
 
 contract: Let WILD COMMA WILD COMMA VBAR
 ##
-## Ends in an error in state: 361.
+## Ends in an error in state: 362.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
 ##
@@ -3475,7 +3531,7 @@ contract: Let WILD COMMA WILD COMMA VBAR
 
 contract: Let WILD COMMA WILD WILD
 ##
-## Ends in an error in state: 360.
+## Ends in an error in state: 361.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . [ RPAR EQ COLON ]
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
@@ -3488,7 +3544,7 @@ contract: Let WILD COMMA WILD WILD
 
 contract: Let WILD EQ Bytes VBAR
 ##
-## Ends in an error in state: 528.
+## Ends in an error in state: 532.
 ##
 ## declaration -> let_declaration . option(SEMI) [ Type Let EOF Attr ]
 ##
@@ -3512,8 +3568,8 @@ contract: Let WILD EQ Bytes VBAR
 ## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
 ## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
 ## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 526, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
-## In state 527, spurious reduction of production let_declaration -> seq(Attr) Let let_binding 
+## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+## In state 531, spurious reduction of production let_declaration -> seq(Attr) Let let_binding 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -3623,7 +3679,7 @@ contract: Type Ident EQ Constr RPAR
 
 contract: Type Ident EQ Constr SEMI WILD
 ##
-## Ends in an error in state: 532.
+## Ends in an error in state: 536.
 ##
 ## declarations -> declaration . [ EOF ]
 ## declarations -> declaration . declarations [ EOF ]
@@ -4072,4 +4128,3 @@ contract: WILD
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
-
diff --git a/src/test/parser_negative_tests.ml b/src/test/parser_negative_tests.ml
index 038bca7f7..6f0a32743 100644
--- a/src/test/parser_negative_tests.ml
+++ b/src/test/parser_negative_tests.ml
@@ -13,6 +13,7 @@ let reasonligo_sdata = {
   parser = Parser.Reasonligo.parse_expression }
 
 let get_exp_as_string filename =
+  Format.printf "Get file\n%!";
   let lines = ref [] in
   let chan = open_in filename in
   try
@@ -21,11 +22,17 @@ let get_exp_as_string filename =
     done; !lines
   with End_of_file ->
     close_in chan;
+  Format.printf "End file\n%!";
     List.rev !lines ;;
 
 let assert_syntax_error sdata () =
+  Format.printf "ASsert\n%!";
+  let n = ref 0 in
   let%bind _l = bind_iter_list
-    (fun entry -> Assert.assert_fail @@ sdata.parser entry)
+    (fun entry -> 
+      n := !n+1;
+      Format.printf "Line %d : %s\n%!" !n entry;
+      Assert.assert_fail @@ sdata.parser entry)
     (get_exp_as_string sdata.erroneous_source_file) in
   ok ()
 

From 6e76a5d96df6dfc3acaa65136fcc66fe7c9313e1 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Mon, 9 Mar 2020 18:45:12 +0100
Subject: [PATCH 19/43] Update messages file

---
 .../pascaligo/error.messages.checked-in       | 6373 +++++++++--------
 1 file changed, 3231 insertions(+), 3142 deletions(-)

diff --git a/src/passes/1-parser/pascaligo/error.messages.checked-in b/src/passes/1-parser/pascaligo/error.messages.checked-in
index 03e031548..51fc4f532 100644
--- a/src/passes/1-parser/pascaligo/error.messages.checked-in
+++ b/src/passes/1-parser/pascaligo/error.messages.checked-in
@@ -1,8 +1,8 @@
 interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ##
-## Ends in an error in state: 110.
+## Ends in an error in state: 144.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET sep_or_term_list(binding,SEMI)
@@ -11,29 +11,29 @@ interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap LBRACKET With
 ##
-## Ends in an error in state: 103.
+## Ends in an error in state: 137.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET
@@ -43,9 +43,9 @@ interactive_expr: BigMap LBRACKET With
 
 interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 237.
+## Ends in an error in state: 250.
 ##
-## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap sep_or_term_list(binding,SEMI)
@@ -54,31 +54,31 @@ interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap With
 ##
-## Ends in an error in state: 102.
+## Ends in an error in state: 136.
 ##
-## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap
@@ -88,9 +88,9 @@ interactive_expr: BigMap With
 
 interactive_expr: C_Some With
 ##
-## Ends in an error in state: 98.
+## Ends in an error in state: 132.
 ##
-## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## C_Some
@@ -100,7 +100,7 @@ interactive_expr: C_Some With
 
 interactive_expr: Case Unit Of C_Some LPAR WILD With
 ##
-## Ends in an error in state: 265.
+## Ends in an error in state: 278.
 ##
 ## par(core_pattern) -> LPAR core_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -112,7 +112,7 @@ interactive_expr: Case Unit Of C_Some LPAR WILD With
 
 interactive_expr: Case Unit Of C_Some LPAR With
 ##
-## Ends in an error in state: 257.
+## Ends in an error in state: 270.
 ##
 ## par(core_pattern) -> LPAR . core_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -124,7 +124,7 @@ interactive_expr: Case Unit Of C_Some LPAR With
 
 interactive_expr: Case Unit Of C_Some With
 ##
-## Ends in an error in state: 256.
+## Ends in an error in state: 269.
 ##
 ## constr_pattern -> C_Some . par(core_pattern) [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -136,7 +136,7 @@ interactive_expr: Case Unit Of C_Some With
 
 interactive_expr: Case Unit Of Constr LPAR WILD With
 ##
-## Ends in an error in state: 271.
+## Ends in an error in state: 284.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . COMMA nsepseq(core_pattern,COMMA) [ RPAR ]
@@ -149,7 +149,7 @@ interactive_expr: Case Unit Of Constr LPAR WILD With
 
 interactive_expr: Case Unit Of Constr LPAR With
 ##
-## Ends in an error in state: 255.
+## Ends in an error in state: 268.
 ##
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -161,7 +161,7 @@ interactive_expr: Case Unit Of Constr LPAR With
 
 interactive_expr: Case Unit Of Constr With
 ##
-## Ends in an error in state: 254.
+## Ends in an error in state: 267.
 ##
 ## constr_pattern -> Constr . tuple_pattern [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## constr_pattern -> Constr . [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -174,9 +174,9 @@ interactive_expr: Case Unit Of Constr With
 
 interactive_expr: Case Unit Of LBRACKET VBAR Block
 ##
-## Ends in an error in state: 242.
+## Ends in an error in state: 255.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR)
@@ -186,9 +186,9 @@ interactive_expr: Case Unit Of LBRACKET VBAR Block
 
 interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ##
-## Ends in an error in state: 306.
+## Ends in an error in state: 319.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR) cases(expr)
@@ -197,28 +197,28 @@ interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 308, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 305, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LBRACKET With
 ##
-## Ends in an error in state: 241.
+## Ends in an error in state: 254.
 ##
-## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET
@@ -228,7 +228,7 @@ interactive_expr: Case Unit Of LBRACKET With
 
 interactive_expr: Case Unit Of LPAR WILD COMMA With
 ##
-## Ends in an error in state: 272.
+## Ends in an error in state: 285.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern COMMA . nsepseq(core_pattern,COMMA) [ RPAR ]
 ##
@@ -240,7 +240,7 @@ interactive_expr: Case Unit Of LPAR WILD COMMA With
 
 interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ##
-## Ends in an error in state: 284.
+## Ends in an error in state: 297.
 ##
 ## par(cons_pattern) -> LPAR cons_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -251,15 +251,15 @@ interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 278, spurious reduction of production pattern -> core_pattern 
-## In state 277, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
+## In state 291, spurious reduction of production pattern -> core_pattern 
+## In state 290, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LPAR WILD CONS With
 ##
-## Ends in an error in state: 276.
+## Ends in an error in state: 289.
 ##
 ## cons_pattern -> core_pattern CONS . pattern [ RPAR ]
 ##
@@ -271,7 +271,7 @@ interactive_expr: Case Unit Of LPAR WILD CONS With
 
 interactive_expr: Case Unit Of LPAR WILD With
 ##
-## Ends in an error in state: 275.
+## Ends in an error in state: 288.
 ##
 ## cons_pattern -> core_pattern . CONS pattern [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
@@ -285,7 +285,7 @@ interactive_expr: Case Unit Of LPAR WILD With
 
 interactive_expr: Case Unit Of LPAR With
 ##
-## Ends in an error in state: 250.
+## Ends in an error in state: 263.
 ##
 ## par(cons_pattern) -> LPAR . cons_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -298,7 +298,7 @@ interactive_expr: Case Unit Of LPAR With
 
 interactive_expr: Case Unit Of List LBRACKET WILD End
 ##
-## Ends in an error in state: 288.
+## Ends in an error in state: 301.
 ##
 ## injection(List,core_pattern) -> List LBRACKET sep_or_term_list(core_pattern,SEMI) . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -309,15 +309,15 @@ interactive_expr: Case Unit Of List LBRACKET WILD End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 292, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 291, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List LBRACKET With
 ##
-## Ends in an error in state: 286.
+## Ends in an error in state: 299.
 ##
 ## injection(List,core_pattern) -> List LBRACKET . sep_or_term_list(core_pattern,SEMI) RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List LBRACKET . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -330,7 +330,7 @@ interactive_expr: Case Unit Of List LBRACKET With
 
 interactive_expr: Case Unit Of List WILD RBRACKET
 ##
-## Ends in an error in state: 300.
+## Ends in an error in state: 313.
 ##
 ## injection(List,core_pattern) -> List sep_or_term_list(core_pattern,SEMI) . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -341,15 +341,15 @@ interactive_expr: Case Unit Of List WILD RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 292, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 291, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 ##
-## Ends in an error in state: 297.
+## Ends in an error in state: 310.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -362,7 +362,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD SEMI WILD With
 ##
-## Ends in an error in state: 296.
+## Ends in an error in state: 309.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -376,7 +376,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD With
 
 interactive_expr: Case Unit Of List WILD SEMI With
 ##
-## Ends in an error in state: 293.
+## Ends in an error in state: 306.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -389,7 +389,7 @@ interactive_expr: Case Unit Of List WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD With
 ##
-## Ends in an error in state: 292.
+## Ends in an error in state: 305.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -403,7 +403,7 @@ interactive_expr: Case Unit Of List WILD With
 
 interactive_expr: Case Unit Of List With
 ##
-## Ends in an error in state: 249.
+## Ends in an error in state: 262.
 ##
 ## injection(List,core_pattern) -> List . sep_or_term_list(core_pattern,SEMI) End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -418,9 +418,9 @@ interactive_expr: Case Unit Of List With
 
 interactive_expr: Case Unit Of VBAR Block
 ##
-## Ends in an error in state: 311.
+## Ends in an error in state: 324.
 ##
-## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR)
@@ -430,9 +430,9 @@ interactive_expr: Case Unit Of VBAR Block
 
 interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 312.
+## Ends in an error in state: 325.
 ##
-## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR) cases(expr)
@@ -441,26 +441,26 @@ interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 308, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 305, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ##
-## Ends in an error in state: 308.
+## Ends in an error in state: 321.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . [ RBRACKET End ]
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . VBAR nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
@@ -472,24 +472,24 @@ interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 304, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 322.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) VBAR . nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
 ##
@@ -501,7 +501,7 @@ interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 
 interactive_expr: Case Unit Of WILD ARROW With
 ##
-## Ends in an error in state: 303.
+## Ends in an error in state: 316.
 ##
 ## case_clause(expr) -> pattern ARROW . expr [ VBAR RBRACKET End ]
 ##
@@ -513,7 +513,7 @@ interactive_expr: Case Unit Of WILD ARROW With
 
 interactive_expr: Case Unit Of WILD CONS WILD CONS With
 ##
-## Ends in an error in state: 282.
+## Ends in an error in state: 295.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -525,7 +525,7 @@ interactive_expr: Case Unit Of WILD CONS WILD CONS With
 
 interactive_expr: Case Unit Of WILD CONS WILD With
 ##
-## Ends in an error in state: 281.
+## Ends in an error in state: 294.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern . [ RPAR ARROW ]
 ## nsepseq(core_pattern,CONS) -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -538,7 +538,7 @@ interactive_expr: Case Unit Of WILD CONS WILD With
 
 interactive_expr: Case Unit Of WILD CONS With
 ##
-## Ends in an error in state: 279.
+## Ends in an error in state: 292.
 ##
 ## pattern -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -550,7 +550,7 @@ interactive_expr: Case Unit Of WILD CONS With
 
 interactive_expr: Case Unit Of WILD RPAR
 ##
-## Ends in an error in state: 302.
+## Ends in an error in state: 315.
 ##
 ## case_clause(expr) -> pattern . ARROW expr [ VBAR RBRACKET End ]
 ##
@@ -561,14 +561,14 @@ interactive_expr: Case Unit Of WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 278, spurious reduction of production pattern -> core_pattern 
+## In state 291, spurious reduction of production pattern -> core_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD With
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 291.
 ##
 ## pattern -> core_pattern . [ RPAR ARROW ]
 ## pattern -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -581,10 +581,10 @@ interactive_expr: Case Unit Of WILD With
 
 interactive_expr: Case Unit Of With
 ##
-## Ends in an error in state: 240.
+## Ends in an error in state: 253.
 ##
-## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of
@@ -594,10 +594,10 @@ interactive_expr: Case Unit Of With
 
 interactive_expr: Case Unit VBAR
 ##
-## Ends in an error in state: 239.
+## Ends in an error in state: 252.
 ##
-## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr
@@ -606,26 +606,26 @@ interactive_expr: Case Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case With
 ##
-## Ends in an error in state: 97.
+## Ends in an error in state: 131.
 ##
-## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case
@@ -633,12 +633,65 @@ interactive_expr: Case With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Constr DOT And With
+##
+## Ends in an error in state: 169.
+##
+## core_expr -> module_field . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call -> module_field . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## module_field
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Constr DOT Ident DOT With
+##
+## Ends in an error in state: 120.
+##
+## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Constr DOT Ident DOT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Constr DOT Ident With
+##
+## Ends in an error in state: 119.
+##
+## module_fun -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Constr DOT Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Constr DOT With
+##
+## Ends in an error in state: 115.
+##
+## module_field -> Constr DOT . module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Constr DOT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Constr With
 ##
-## Ends in an error in state: 94.
+## Ends in an error in state: 114.
 ##
-## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## module_field -> Constr . DOT module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr
@@ -648,24 +701,24 @@ interactive_expr: Constr With
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 ##
-## Ends in an error in state: 152.
+## Ends in an error in state: 112.
 ##
-## fun_expr -> option(Recursive) Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## option(Recursive) Function parameters COLON type_expr Is
+## Function parameters COLON type_expr Is
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 ##
-## Ends in an error in state: 151.
+## Ends in an error in state: 111.
 ##
-## fun_expr -> option(Recursive) Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## option(Recursive) Function parameters COLON type_expr
+## Function parameters COLON type_expr
 ##
 ## WARNING: This example involves spurious reductions.
 ## This implies that, although the LR(1) items shown above provide an
@@ -681,31 +734,31 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON With
 ##
-## Ends in an error in state: 150.
+## Ends in an error in state: 110.
 ##
-## fun_expr -> option(Recursive) Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## option(Recursive) Function parameters COLON
+## Function parameters COLON
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR With
 ##
-## Ends in an error in state: 149.
+## Ends in an error in state: 109.
 ##
-## fun_expr -> option(Recursive) Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## option(Recursive) Function parameters
+## Function parameters
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Const Ident COLON With
 ##
-## Ends in an error in state: 142.
+## Ends in an error in state: 77.
 ##
 ## param_decl -> Const Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -717,7 +770,7 @@ interactive_expr: Function LPAR Const Ident COLON With
 
 interactive_expr: Function LPAR Const Ident With
 ##
-## Ends in an error in state: 141.
+## Ends in an error in state: 76.
 ##
 ## param_decl -> Const Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -729,7 +782,7 @@ interactive_expr: Function LPAR Const Ident With
 
 interactive_expr: Function LPAR Const With
 ##
-## Ends in an error in state: 140.
+## Ends in an error in state: 75.
 ##
 ## param_decl -> Const . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -741,7 +794,7 @@ interactive_expr: Function LPAR Const With
 
 interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 ##
-## Ends in an error in state: 145.
+## Ends in an error in state: 80.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl SEMI . nsepseq(param_decl,SEMI) [ RPAR ]
 ##
@@ -753,7 +806,7 @@ interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 
 interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ##
-## Ends in an error in state: 144.
+## Ends in an error in state: 79.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl . [ RPAR ]
 ## nsepseq(param_decl,SEMI) -> param_decl . SEMI nsepseq(param_decl,SEMI) [ RPAR ]
@@ -768,15 +821,15 @@ interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ## In state 15, spurious reduction of production core_type -> Ident 
 ## In state 29, spurious reduction of production cartesian -> core_type 
 ## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 139, spurious reduction of production param_type -> fun_type 
-## In state 138, spurious reduction of production param_decl -> Var Ident COLON param_type 
+## In state 74, spurious reduction of production param_type -> fun_type 
+## In state 73, spurious reduction of production param_decl -> Var Ident COLON param_type 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Var Ident COLON With
 ##
-## Ends in an error in state: 137.
+## Ends in an error in state: 72.
 ##
 ## param_decl -> Var Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -788,7 +841,7 @@ interactive_expr: Function LPAR Var Ident COLON With
 
 interactive_expr: Function LPAR Var Ident With
 ##
-## Ends in an error in state: 136.
+## Ends in an error in state: 71.
 ##
 ## param_decl -> Var Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -800,7 +853,7 @@ interactive_expr: Function LPAR Var Ident With
 
 interactive_expr: Function LPAR Var With
 ##
-## Ends in an error in state: 135.
+## Ends in an error in state: 70.
 ##
 ## param_decl -> Var . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -812,7 +865,7 @@ interactive_expr: Function LPAR Var With
 
 interactive_expr: Function LPAR With
 ##
-## Ends in an error in state: 134.
+## Ends in an error in state: 69.
 ##
 ## par(nsepseq(param_decl,SEMI)) -> LPAR . nsepseq(param_decl,SEMI) RPAR [ COLON ]
 ##
@@ -824,21 +877,21 @@ interactive_expr: Function LPAR With
 
 interactive_expr: Function With
 ##
-## Ends in an error in state: 133.
+## Ends in an error in state: 108.
 ##
-## fun_expr -> option(Recursive) Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
-## option(Recursive) Function
+## Function
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident DOT Ident ASS
 ##
-## Ends in an error in state: 113.
+## Ends in an error in state: 147.
 ##
-## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> projection . [ With LBRACKET ]
 ##
 ## The known suffix of the stack is as follows:
@@ -848,17 +901,17 @@ interactive_expr: Ident DOT Ident ASS
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 322, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 325, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident DOT Int DOT With
 ##
-## Ends in an error in state: 323.
+## Ends in an error in state: 124.
 ##
-## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection DOT
@@ -868,10 +921,10 @@ interactive_expr: Ident DOT Int DOT With
 
 interactive_expr: Ident DOT Int While
 ##
-## Ends in an error in state: 322.
+## Ends in an error in state: 123.
 ##
-## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection
@@ -881,9 +934,9 @@ interactive_expr: Ident DOT Int While
 
 interactive_expr: Ident DOT With
 ##
-## Ends in an error in state: 319.
+## Ends in an error in state: 334.
 ##
-## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident DOT
@@ -893,9 +946,9 @@ interactive_expr: Ident DOT With
 
 interactive_expr: Ident LBRACKET Unit VBAR
 ##
-## Ends in an error in state: 221.
+## Ends in an error in state: 234.
 ##
-## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET expr
@@ -904,25 +957,25 @@ interactive_expr: Ident LBRACKET Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LBRACKET With
 ##
-## Ends in an error in state: 220.
+## Ends in an error in state: 233.
 ##
-## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET
@@ -932,7 +985,7 @@ interactive_expr: Ident LBRACKET With
 
 interactive_expr: Ident LPAR Unit COMMA With
 ##
-## Ends in an error in state: 317.
+## Ends in an error in state: 332.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
 ##
@@ -944,7 +997,7 @@ interactive_expr: Ident LPAR Unit COMMA With
 
 interactive_expr: Ident LPAR Unit VBAR
 ##
-## Ends in an error in state: 316.
+## Ends in an error in state: 331.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RPAR ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
@@ -956,25 +1009,25 @@ interactive_expr: Ident LPAR Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LPAR With
 ##
-## Ends in an error in state: 92.
+## Ends in an error in state: 107.
 ##
-## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -984,12 +1037,12 @@ interactive_expr: Ident LPAR With
 
 interactive_expr: Ident While
 ##
-## Ends in an error in state: 91.
+## Ends in an error in state: 106.
 ##
-## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> Ident . [ With LBRACKET ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -999,7 +1052,7 @@ interactive_expr: Ident While
 
 interactive_expr: Ident With Record Ident DOT With
 ##
-## Ends in an error in state: 121.
+## Ends in an error in state: 155.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ EQ ]
 ##
@@ -1011,9 +1064,9 @@ interactive_expr: Ident With Record Ident DOT With
 
 interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ##
-## Ends in an error in state: 217.
+## Ends in an error in state: 230.
 ##
-## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_path_assignment,SEMI)
@@ -1022,26 +1075,26 @@ interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 210, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 126, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 215.
+## Ends in an error in state: 228.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1054,7 +1107,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 214.
+## Ends in an error in state: 227.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1067,24 +1120,24 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 211.
+## Ends in an error in state: 224.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1097,7 +1150,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 210.
+## Ends in an error in state: 223.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1110,24 +1163,24 @@ interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ With
 ##
-## Ends in an error in state: 128.
+## Ends in an error in state: 162.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) EQ . expr [ SEMI RBRACKET End ]
 ##
@@ -1139,7 +1192,7 @@ interactive_expr: Ident With Record Ident EQ With
 
 interactive_expr: Ident With Record Ident With
 ##
-## Ends in an error in state: 120.
+## Ends in an error in state: 154.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ EQ ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ EQ ]
@@ -1152,9 +1205,9 @@ interactive_expr: Ident With Record Ident With
 
 interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 123.
+## Ends in an error in state: 157.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_path_assignment,SEMI)
@@ -1163,28 +1216,28 @@ interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 209, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 210, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 126, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record LBRACKET With
 ##
-## Ends in an error in state: 119.
+## Ends in an error in state: 153.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -1194,10 +1247,10 @@ interactive_expr: Ident With Record LBRACKET With
 
 interactive_expr: Ident With Record With
 ##
-## Ends in an error in state: 118.
+## Ends in an error in state: 152.
 ##
-## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -1207,9 +1260,9 @@ interactive_expr: Ident With Record With
 
 interactive_expr: Ident With With
 ##
-## Ends in an error in state: 117.
+## Ends in an error in state: 151.
 ##
-## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## path With
@@ -1219,9 +1272,9 @@ interactive_expr: Ident With With
 
 interactive_expr: If Unit Then Unit Else With
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 341.
 ##
-## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI) Else
@@ -1231,9 +1284,9 @@ interactive_expr: If Unit Then Unit Else With
 
 interactive_expr: If Unit Then Unit SEMI EQ
 ##
-## Ends in an error in state: 330.
+## Ends in an error in state: 340.
 ##
-## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI)
@@ -1243,9 +1296,9 @@ interactive_expr: If Unit Then Unit SEMI EQ
 
 interactive_expr: If Unit Then Unit VBAR
 ##
-## Ends in an error in state: 329.
+## Ends in an error in state: 339.
 ##
-## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr
@@ -1254,25 +1307,25 @@ interactive_expr: If Unit Then Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If Unit Then With
 ##
-## Ends in an error in state: 328.
+## Ends in an error in state: 338.
 ##
-## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then
@@ -1282,9 +1335,9 @@ interactive_expr: If Unit Then With
 
 interactive_expr: If Unit VBAR
 ##
-## Ends in an error in state: 327.
+## Ends in an error in state: 337.
 ##
-## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr
@@ -1293,25 +1346,25 @@ interactive_expr: If Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If With
 ##
-## Ends in an error in state: 90.
+## Ends in an error in state: 105.
 ##
-## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If
@@ -1321,9 +1374,9 @@ interactive_expr: If With
 
 interactive_expr: LPAR Bytes RPAR With
 ##
-## Ends in an error in state: 130.
+## Ends in an error in state: 164.
 ##
-## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## par(expr)
@@ -1333,9 +1386,9 @@ interactive_expr: LPAR Bytes RPAR With
 
 interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ##
-## Ends in an error in state: 335.
+## Ends in an error in state: 345.
 ##
-## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## tuple_comp -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
 ##
 ## The known suffix of the stack is as follows:
@@ -1345,125 +1398,27 @@ interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 332, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
-## In state 206, spurious reduction of production expr -> cond_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON BigMap With
-##
-## Ends in an error in state: 18.
-##
-## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## BigMap
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Constr Of With
-##
-## Ends in an error in state: 27.
-##
-## variant -> Constr Of . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## Constr Of
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Constr VBAR With
-##
-## Ends in an error in state: 39.
-##
-## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## variant VBAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Constr With
-##
-## Ends in an error in state: 26.
-##
-## variant -> Constr . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## variant -> Constr . Of fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## Constr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Ident ARROW With
-##
-## Ends in an error in state: 36.
-##
-## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-##
-## The known suffix of the stack is as follows:
-## cartesian ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Ident TIMES Ident TIMES With
-##
-## Ends in an error in state: 33.
-##
-## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type TIMES
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Ident TIMES LPAR Ident RPAR With
-##
-## Ends in an error in state: 32.
-##
-## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COLON Ident TIMES With
-##
-## Ends in an error in state: 30.
-##
-## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_type TIMES
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 342, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
+## In state 221, spurious reduction of production expr -> cond_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR Unit COLON Ident VBAR
 ##
-## Ends in an error in state: 341.
+## Ends in an error in state: 351.
 ##
-## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR disj_expr COLON type_expr
@@ -1480,12 +1435,543 @@ interactive_expr: LPAR Unit COLON Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Ident With
+interactive_expr: LPAR Unit COLON With
 ##
-## Ends in an error in state: 15.
+## Ends in an error in state: 350.
 ##
-## core_type -> Ident . [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## LPAR disj_expr COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit COMMA With
+##
+## Ends in an error in state: 347.
+##
+## tuple_comp -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
+##
+## The known suffix of the stack is as follows:
+## expr COMMA
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR Unit VBAR
+##
+## Ends in an error in state: 349.
+##
+## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## disj_expr -> disj_expr . Or conj_expr [ RPAR Or COMMA COLON ]
+## expr -> disj_expr . [ RPAR COMMA ]
+##
+## The known suffix of the stack is as follows:
+## LPAR disj_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: LPAR With
+##
+## Ends in an error in state: 103.
+##
+## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## LPAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List LBRACKET Unit End
+##
+## Ends in an error in state: 355.
+##
+## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List LBRACKET With
+##
+## Ends in an error in state: 353.
+##
+## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List Unit RBRACKET
+##
+## Ends in an error in state: 367.
+##
+## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: List With
+##
+## Ends in an error in state: 102.
+##
+## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## List
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: MINUS With
+##
+## Ends in an error in state: 101.
+##
+## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## MINUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map LBRACKET Unit ARROW Bytes End
+##
+## Ends in an error in state: 372.
+##
+## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map LBRACKET With
+##
+## Ends in an error in state: 370.
+##
+## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes RBRACKET
+##
+## Ends in an error in state: 375.
+##
+## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
+##
+## Ends in an error in state: 247.
+##
+## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
+##
+## Ends in an error in state: 246.
+##
+## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
+## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes SEMI With
+##
+## Ends in an error in state: 243.
+##
+## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW Bytes VBAR
+##
+## Ends in an error in state: 242.
+##
+## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
+## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit ARROW With
+##
+## Ends in an error in state: 240.
+##
+## binding -> expr ARROW . expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map Unit VBAR
+##
+## Ends in an error in state: 239.
+##
+## binding -> expr . ARROW expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Map With
+##
+## Ends in an error in state: 100.
+##
+## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Not Bytes With
+##
+## Ends in an error in state: 166.
+##
+## add_expr -> mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Not With
+##
+## Ends in an error in state: 96.
+##
+## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Not
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes RBRACKET
+##
+## Ends in an error in state: 390.
+##
+## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
+##
+## Ends in an error in state: 388.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 387.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
+## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes SEMI With
+##
+## Ends in an error in state: 384.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 383.
+##
+## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
+## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## field_assignment
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident EQ With
+##
+## Ends in an error in state: 95.
+##
+## field_assignment -> Ident EQ . expr [ SEMI RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## Ident EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record Ident With
+##
+## Ends in an error in state: 94.
+##
+## field_assignment -> Ident . EQ expr [ SEMI RBRACKET End ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -1493,12 +1979,2230 @@ interactive_expr: LPAR Unit COLON Ident With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON LPAR Ident RPAR With
+interactive_expr: Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 29.
+## Ends in an error in state: 379.
 ##
-## cartesian -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record LBRACKET With
+##
+## Ends in an error in state: 93.
+##
+## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Record With
+##
+## Ends in an error in state: 92.
+##
+## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Record
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set LBRACKET Unit End
+##
+## Ends in an error in state: 394.
+##
+## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set LBRACKET With
+##
+## Ends in an error in state: 392.
+##
+## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit RBRACKET
+##
+## Ends in an error in state: 397.
+##
+## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit SEMI Unit SEMI With
+##
+## Ends in an error in state: 364.
+##
+## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit SEMI Unit VBAR
+##
+## Ends in an error in state: 363.
+##
+## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
+## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit SEMI With
+##
+## Ends in an error in state: 360.
+##
+## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set Unit VBAR
+##
+## Ends in an error in state: 359.
+##
+## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
+## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Set With
+##
+## Ends in an error in state: 91.
+##
+## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit And With
+##
+## Ends in an error in state: 218.
+##
+## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## conj_expr And
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit CAT With
+##
+## Ends in an error in state: 194.
+##
+## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## cons_expr CAT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit COLON
+##
+## Ends in an error in state: 188.
+##
+## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## expr -> disj_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## disj_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit CONS With
+##
+## Ends in an error in state: 201.
+##
+## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr CONS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Contains With
+##
+## Ends in an error in state: 191.
+##
+## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_expr Contains
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit EQ With
+##
+## Ends in an error in state: 214.
+##
+## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit GE With
+##
+## Ends in an error in state: 212.
+##
+## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr GE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit GT With
+##
+## Ends in an error in state: 210.
+##
+## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr GT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit LE With
+##
+## Ends in an error in state: 208.
+##
+## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr LE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit LT With
+##
+## Ends in an error in state: 206.
+##
+## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr LT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit MINUS Unit With
+##
+## Ends in an error in state: 200.
+##
+## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr MINUS mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit MINUS With
+##
+## Ends in an error in state: 199.
+##
+## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr MINUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Mod With
+##
+## Ends in an error in state: 184.
+##
+## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr Mod
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit NE With
+##
+## Ends in an error in state: 204.
+##
+## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## comp_expr NE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit Or With
+##
+## Ends in an error in state: 189.
+##
+## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## disj_expr Or
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit PLUS Unit With
+##
+## Ends in an error in state: 198.
+##
+## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr PLUS mult_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit PLUS With
+##
+## Ends in an error in state: 197.
+##
+## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## add_expr PLUS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit SLASH With
+##
+## Ends in an error in state: 182.
+##
+## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr SLASH
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit TIMES With
+##
+## Ends in an error in state: 167.
+##
+## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## mult_expr TIMES
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit VBAR
+##
+## Ends in an error in state: 586.
+##
+## interactive_expr -> expr . EOF [ # ]
+##
+## The known suffix of the stack is as follows:
+## expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Unit With
+##
+## Ends in an error in state: 190.
+##
+## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_expr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: With
+##
+## Ends in an error in state: 584.
+##
+## interactive_expr' -> . interactive_expr [ # ]
+##
+## The known suffix of the stack is as follows:
+##
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes LBRACKET String End
+##
+## Ends in an error in state: 530.
+##
+## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes LBRACKET sep_or_term_list(String,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes LBRACKET With
+##
+## Ends in an error in state: 529.
+##
+## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End Attributes String End SEMI With
+##
+## Ends in an error in state: 579.
+##
+## seq(declaration) -> declaration . seq(declaration) [ EOF ]
+##
+## The known suffix of the stack is as follows:
+## declaration
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End SEMI With
+##
+## Ends in an error in state: 577.
+##
+## nseq(declaration) -> declaration . seq(declaration) [ EOF ]
+##
+## The known suffix of the stack is as follows:
+## declaration
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String End With
+##
+## Ends in an error in state: 572.
+##
+## attr_decl -> open_attr_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_attr_decl
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String RBRACKET
+##
+## Ends in an error in state: 534.
+##
+## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes sep_or_term_list(String,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI String SEMI With
+##
+## Ends in an error in state: 525.
+##
+## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI String With
+##
+## Ends in an error in state: 524.
+##
+## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
+## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
+## seq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String SEMI With
+##
+## Ends in an error in state: 523.
+##
+## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes String With
+##
+## Ends in an error in state: 522.
+##
+## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
+## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
+## nseq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## String
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Attributes With
+##
+## Ends in an error in state: 521.
+##
+## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Attributes
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident EQ Bytes VBAR
+##
+## Ends in an error in state: 570.
+##
+## const_decl -> open_const_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_const_decl
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 478, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
+## In state 479, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident EQ With
+##
+## Ends in an error in state: 477.
+##
+## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr EQ
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON Ident VBAR
+##
+## Ends in an error in state: 476.
+##
+## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident COLON With
+##
+## Ends in an error in state: 475.
+##
+## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const Ident With
+##
+## Ends in an error in state: 474.
+##
+## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Const With
+##
+## Ends in an error in state: 473.
+##
+## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Const
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET VBAR Block
+##
+## Ends in an error in state: 484.
+##
+## case(if_clause) -> Case expr Of LBRACKET option(VBAR) . cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET option(VBAR)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET WILD ARROW Skip End
+##
+## Ends in an error in state: 513.
+##
+## case(if_clause) -> Case expr Of LBRACKET option(VBAR) cases(if_clause) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET option(VBAR) cases(if_clause)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET With
+##
+## Ends in an error in state: 483.
+##
+## case(if_clause) -> Case expr Of LBRACKET . option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of VBAR Block
+##
+## Ends in an error in state: 518.
+##
+## case(if_clause) -> Case expr Of option(VBAR) . cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of option(VBAR)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip RBRACKET
+##
+## Ends in an error in state: 519.
+##
+## case(if_clause) -> Case expr Of option(VBAR) cases(if_clause) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of option(VBAR) cases(if_clause)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip VBAR With
+##
+## Ends in an error in state: 516.
+##
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) VBAR . nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## case_clause(if_clause) VBAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip With
+##
+## Ends in an error in state: 515.
+##
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . [ RBRACKET End ]
+## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . VBAR nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## case_clause(if_clause)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW With
+##
+## Ends in an error in state: 486.
+##
+## case_clause(if_clause) -> pattern ARROW . if_clause [ VBAR RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## pattern ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD RPAR
+##
+## Ends in an error in state: 485.
+##
+## case_clause(if_clause) -> pattern . ARROW if_clause [ VBAR RBRACKET End ]
+##
+## The known suffix of the stack is as follows:
+## pattern
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 291, spurious reduction of production pattern -> core_pattern 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of With
+##
+## Ends in an error in state: 482.
+##
+## case(if_clause) -> Case expr Of . option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case expr Of . LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr Of
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit VBAR
+##
+## Ends in an error in state: 481.
+##
+## case(if_clause) -> Case expr . Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case expr . Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case With
+##
+## Ends in an error in state: 480.
+##
+## case(if_clause) -> Case . expr Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## case(if_clause) -> Case . expr Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Case
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr DOT And With
+##
+## Ends in an error in state: 493.
+##
+## fun_call -> module_field . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## module_field
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr With
+##
+## Ends in an error in state: 472.
+##
+## module_field -> Constr . DOT module_fun [ LPAR ]
+## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
+##
+## The known suffix of the stack is as follows:
+## Constr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW Ident With
+##
+## Ends in an error in state: 459.
+##
+## for_loop -> For Ident option(arrow_clause) . In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW With
+##
+## Ends in an error in state: 457.
+##
+## arrow_clause -> ARROW . Ident [ In ]
+##
+## The known suffix of the stack is as follows:
+## ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To Unit VBAR
+##
+## Ends in an error in state: 470.
+##
+## for_loop -> For var_assign To expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign To expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To With
+##
+## Ends in an error in state: 469.
+##
+## for_loop -> For var_assign To . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign To
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes VBAR
+##
+## Ends in an error in state: 468.
+##
+## for_loop -> For var_assign . To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For var_assign
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 456, spurious reduction of production var_assign -> Ident ASS expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS With
+##
+## Ends in an error in state: 455.
+##
+## var_assign -> Ident ASS . expr [ To ]
+##
+## The known suffix of the stack is as follows:
+## Ident ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set Unit VBAR
+##
+## Ends in an error in state: 465.
+##
+## for_loop -> For Ident option(arrow_clause) In collection expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In collection expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set With
+##
+## Ends in an error in state: 464.
+##
+## for_loop -> For Ident option(arrow_clause) In collection . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In collection
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In With
+##
+## Ends in an error in state: 460.
+##
+## for_loop -> For Ident option(arrow_clause) In . collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For Ident option(arrow_clause) In
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident With
+##
+## Ends in an error in state: 454.
+##
+## for_loop -> For Ident . option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+## var_assign -> Ident . ASS expr [ To ]
+##
+## The known suffix of the stack is as follows:
+## For Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For With
+##
+## Ends in an error in state: 453.
+##
+## for_loop -> For . var_assign To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+## for_loop -> For . Ident option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## For
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident ASS With
+##
+## Ends in an error in state: 499.
+##
+## assignment -> lhs ASS . rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## lhs ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident DOT Ident With
+##
+## Ends in an error in state: 492.
+##
+## lhs -> path . [ ASS ]
+## map_lookup -> path . brackets(expr) [ ASS ]
+##
+## The known suffix of the stack is as follows:
+## path
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 420, spurious reduction of production path -> projection 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident LBRACKET Bytes RBRACKET With
+##
+## Ends in an error in state: 498.
+##
+## assignment -> lhs . ASS rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## lhs
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident With
+##
+## Ends in an error in state: 452.
+##
+## fun_call -> Ident . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
+## path -> Ident . [ LBRACKET ASS ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE Skip End
+##
+## Ends in an error in state: 550.
+##
+## clause_block -> LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## LBRACE sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE With
+##
+## Ends in an error in state: 451.
+##
+## clause_block -> LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## LBRACE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip Else With
+##
+## Ends in an error in state: 556.
+##
+## conditional -> If expr Then if_clause option(SEMI) Else . if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause option(SEMI) Else
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip SEMI EQ
+##
+## Ends in an error in state: 555.
+##
+## conditional -> If expr Then if_clause option(SEMI) . Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause option(SEMI)
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip With
+##
+## Ends in an error in state: 554.
+##
+## conditional -> If expr Then if_clause . option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then if_clause
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then With
+##
+## Ends in an error in state: 450.
+##
+## conditional -> If expr Then . if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr Then
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit VBAR
+##
+## Ends in an error in state: 449.
+##
+## conditional -> If expr . Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If With
+##
+## Ends in an error in state: 448.
+##
+## conditional -> If . expr Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## If
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT Ident With
+##
+## Ends in an error in state: 419.
+##
+## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Constr DOT Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT With
+##
+## Ends in an error in state: 418.
+##
+## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Constr DOT
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr With
+##
+## Ends in an error in state: 417.
+##
+## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Constr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident VBAR
+##
+## Ends in an error in state: 425.
+##
+## map_patch -> Patch path . With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch path . With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch path . With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch path
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 416, spurious reduction of production path -> Ident 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident While
+##
+## Ends in an error in state: 416.
+##
+## path -> Ident . [ With VBAR SEMI RBRACKET RBRACE End Else ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET Unit ARROW Bytes End
+##
+## Ends in an error in state: 441.
+##
+## ne_injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET With
+##
+## Ends in an error in state: 440.
+##
+## ne_injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map Unit ARROW Bytes RBRACKET
+##
+## Ends in an error in state: 443.
+##
+## ne_injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map sep_or_term_list(binding,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map With
+##
+## Ends in an error in state: 439.
+##
+## ne_injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record Ident EQ Bytes RBRACKET
+##
+## Ends in an error in state: 437.
+##
+## ne_injection(Record,field_assignment) -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET Ident EQ Bytes End
+##
+## Ends in an error in state: 435.
+##
+## ne_injection(Record,field_assignment) -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET With
+##
+## Ends in an error in state: 434.
+##
+## ne_injection(Record,field_assignment) -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record With
+##
+## Ends in an error in state: 433.
+##
+## ne_injection(Record,field_assignment) -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Record,field_assignment) -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Record
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET Unit End
+##
+## Ends in an error in state: 429.
+##
+## ne_injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET With
+##
+## Ends in an error in state: 428.
+##
+## ne_injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set LBRACKET
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set Unit RBRACKET
+##
+## Ends in an error in state: 431.
+##
+## ne_injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set sep_or_term_list(expr,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set With
+##
+## Ends in an error in state: 427.
+##
+## ne_injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
+## ne_injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With With
+##
+## Ends in an error in state: 426.
+##
+## map_patch -> Patch path With . ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch path With . ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch path With . ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch path With
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch With
+##
+## Ends in an error in state: 424.
+##
+## map_patch -> Patch . path With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## record_patch -> Patch . path With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_patch -> Patch . path With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Patch
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Map With
+##
+## Ends in an error in state: 422.
+##
+## map_remove -> Remove expr From Map . path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From Map
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Set With
+##
+## Ends in an error in state: 415.
+##
+## set_remove -> Remove expr From Set . path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From Set
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From With
+##
+## Ends in an error in state: 414.
+##
+## map_remove -> Remove expr From . Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove expr From . Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr From
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit VBAR
+##
+## Ends in an error in state: 413.
+##
+## map_remove -> Remove expr . From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove expr . From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove With
+##
+## Ends in an error in state: 412.
+##
+## map_remove -> Remove . expr From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
+## set_remove -> Remove . expr From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Remove
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
+##
+## Ends in an error in state: 564.
+##
+## open_fun_decl -> Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters COLON type_expr Is block
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
+##
+## Ends in an error in state: 565.
+##
+## open_fun_decl -> Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters COLON type_expr Is block With
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip RBRACE
+##
+## Ends in an error in state: 558.
+##
+## block -> Begin sep_or_term_list(statement,SEMI) . End [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Begin sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip SEMI With
+##
+## Ends in an error in state: 539.
+##
+## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
+## seq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip With
+##
+## Ends in an error in state: 538.
+##
+## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
+## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
+## seq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI With
+##
+## Ends in an error in state: 537.
+##
+## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
+## nseq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement SEMI
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip With
+##
+## Ends in an error in state: 536.
+##
+## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
+## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
+## nseq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## statement
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident ASS With
+##
+## Ends in an error in state: 408.
+##
+## unqualified_decl(ASS) -> Ident COLON type_expr ASS . expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr ASS
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident VBAR
+##
+## Ends in an error in state: 407.
+##
+## unqualified_decl(ASS) -> Ident COLON type_expr . ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON With
+##
+## Ends in an error in state: 406.
+##
+## unqualified_decl(ASS) -> Ident COLON . type_expr ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident With
+##
+## Ends in an error in state: 405.
+##
+## unqualified_decl(ASS) -> Ident . COLON type_expr ASS expr [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var With
+##
+## Ends in an error in state: 404.
+##
+## open_var_decl -> Var . unqualified_decl(ASS) [ SEMI RBRACE End ]
+##
+## The known suffix of the stack is as follows:
+## Var
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While Unit VBAR
+##
+## Ends in an error in state: 402.
+##
+## while_loop -> While expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## While expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While With
+##
+## Ends in an error in state: 401.
+##
+## while_loop -> While . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## While
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin With
+##
+## Ends in an error in state: 403.
+##
+## block -> Begin . sep_or_term_list(statement,SEMI) End [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Begin
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE Skip End
+##
+## Ends in an error in state: 561.
+##
+## block -> Block LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block LBRACE sep_or_term_list(statement,SEMI)
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE With
+##
+## Ends in an error in state: 400.
+##
+## block -> Block LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block LBRACE
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block With
+##
+## Ends in an error in state: 399.
+##
+## block -> Block . LBRACE sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
+##
+## The known suffix of the stack is as follows:
+## Block
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes VBAR
+##
+## Ends in an error in state: 568.
+##
+## fun_decl -> open_fun_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## open_fun_decl
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 190, spurious reduction of production unary_expr -> core_expr 
+## In state 140, spurious reduction of production mult_expr -> unary_expr 
+## In state 166, spurious reduction of production add_expr -> mult_expr 
+## In state 196, spurious reduction of production cons_expr -> add_expr 
+## In state 193, spurious reduction of production cat_expr -> cons_expr 
+## In state 216, spurious reduction of production comp_expr -> cat_expr 
+## In state 203, spurious reduction of production set_membership -> comp_expr 
+## In state 142, spurious reduction of production conj_expr -> set_membership 
+## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 563, spurious reduction of production open_fun_decl -> Function Ident parameters COLON type_expr Is expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
+##
+## Ends in an error in state: 87.
+##
+## open_fun_decl -> Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr Is . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters COLON type_expr Is
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
+##
+## Ends in an error in state: 86.
+##
+## open_fun_decl -> Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr . Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
+##
+## Ends in an error in state: 85.
+##
+## open_fun_decl -> Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON . type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident LPAR Const Ident COLON Ident RPAR With
+##
+## Ends in an error in state: 84.
+##
+## open_fun_decl -> Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters . COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident parameters
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function Ident With
+##
+## Ends in an error in state: 68.
+##
+## open_fun_decl -> Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident . parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Function With
+##
+## Ends in an error in state: 67.
+##
+## open_fun_decl -> Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function . Ident parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Function
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is BigMap With
+##
+## Ends in an error in state: 18.
+##
+## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## BigMap
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Constr Of With
+##
+## Ends in an error in state: 27.
+##
+## variant -> Constr Of . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## Constr Of
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Constr VBAR With
+##
+## Ends in an error in state: 39.
+##
+## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## variant VBAR
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Constr With
+##
+## Ends in an error in state: 26.
+##
+## variant -> Constr . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## variant -> Constr . Of fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## Constr
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident ARROW With
+##
+## Ends in an error in state: 36.
+##
+## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+##
+## The known suffix of the stack is as follows:
+## cartesian ARROW
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident TIMES Ident TIMES With
+##
+## Ends in an error in state: 33.
+##
+## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type TIMES
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident TIMES LPAR Ident RPAR With
+##
+## Ends in an error in state: 32.
+##
+## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type
@@ -1506,11 +4210,70 @@ interactive_expr: LPAR Unit COLON LPAR Ident RPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON LPAR Ident VBAR
+contract: Type Ident Is Ident TIMES With
+##
+## Ends in an error in state: 30.
+##
+## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type TIMES
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident VBAR
+##
+## Ends in an error in state: 64.
+##
+## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Function EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Type Ident Is type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is Ident With
+##
+## Ends in an error in state: 15.
+##
+## core_type -> Ident . [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is LPAR Constr RPAR With
+##
+## Ends in an error in state: 29.
+##
+## cartesian -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+##
+## The known suffix of the stack is as follows:
+## core_type
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Type Ident Is LPAR Ident VBAR
 ##
 ## Ends in an error in state: 61.
 ##
-## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR type_expr
@@ -1527,11 +4290,11 @@ interactive_expr: LPAR Unit COLON LPAR Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON LPAR With
+contract: Type Ident Is LPAR With
 ##
 ## Ends in an error in state: 6.
 ##
-## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -1539,11 +4302,11 @@ interactive_expr: LPAR Unit COLON LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON List With
+contract: Type Ident Is List With
 ##
 ## Ends in an error in state: 13.
 ##
-## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List
@@ -1551,7 +4314,7 @@ interactive_expr: LPAR Unit COLON List With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Map LPAR Ident COMMA With
+contract: Type Ident Is Map LPAR Ident COMMA With
 ##
 ## Ends in an error in state: 21.
 ##
@@ -1563,7 +4326,7 @@ interactive_expr: LPAR Unit COLON Map LPAR Ident COMMA With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Map LPAR Ident VBAR
+contract: Type Ident Is Map LPAR Ident VBAR
 ##
 ## Ends in an error in state: 20.
 ##
@@ -1585,11 +4348,11 @@ interactive_expr: LPAR Unit COLON Map LPAR Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Map LPAR With
+contract: Type Ident Is Map LPAR With
 ##
 ## Ends in an error in state: 12.
 ##
-## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -1597,11 +4360,11 @@ interactive_expr: LPAR Unit COLON Map LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Map With
+contract: Type Ident Is Map With
 ##
 ## Ends in an error in state: 11.
 ##
-## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map
@@ -1609,11 +4372,11 @@ interactive_expr: LPAR Unit COLON Map With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON Ident RBRACKET
+contract: Type Ident Is Record Ident COLON Ident RBRACKET
 ##
 ## Ends in an error in state: 59.
 ##
-## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_decl,SEMI)
@@ -1633,7 +4396,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON Ident RBRACKET
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Ident SEMI With
+contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident SEMI With
 ##
 ## Ends in an error in state: 57.
 ##
@@ -1646,7 +4409,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Iden
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Ident VBAR
+contract: Type Ident Is Record Ident COLON Ident SEMI Ident COLON Ident VBAR
 ##
 ## Ends in an error in state: 56.
 ##
@@ -1670,7 +4433,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI Ident COLON Iden
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI With
+contract: Type Ident Is Record Ident COLON Ident SEMI With
 ##
 ## Ends in an error in state: 53.
 ##
@@ -1683,7 +4446,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON Ident SEMI With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON Ident VBAR
+contract: Type Ident Is Record Ident COLON Ident VBAR
 ##
 ## Ends in an error in state: 52.
 ##
@@ -1707,7 +4470,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON Ident VBAR
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident COLON With
+contract: Type Ident Is Record Ident COLON With
 ##
 ## Ends in an error in state: 10.
 ##
@@ -1719,7 +4482,7 @@ interactive_expr: LPAR Unit COLON Record Ident COLON With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record Ident With
+contract: Type Ident Is Record Ident With
 ##
 ## Ends in an error in state: 9.
 ##
@@ -1731,11 +4494,11 @@ interactive_expr: LPAR Unit COLON Record Ident With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record LBRACKET Ident COLON Ident End
+contract: Type Ident Is Record LBRACKET Ident COLON Ident End
 ##
 ## Ends in an error in state: 48.
 ##
-## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_decl,SEMI)
@@ -1755,11 +4518,11 @@ interactive_expr: LPAR Unit COLON Record LBRACKET Ident COLON Ident End
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record LBRACKET With
+contract: Type Ident Is Record LBRACKET With
 ##
 ## Ends in an error in state: 8.
 ##
-## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -1767,12 +4530,12 @@ interactive_expr: LPAR Unit COLON Record LBRACKET With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Record With
+contract: Type Ident Is Record With
 ##
 ## Ends in an error in state: 7.
 ##
-## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -1780,11 +4543,11 @@ interactive_expr: LPAR Unit COLON Record With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON Set With
+contract: Type Ident Is Set With
 ##
 ## Ends in an error in state: 5.
 ##
-## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set
@@ -1792,11 +4555,11 @@ interactive_expr: LPAR Unit COLON Set With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON VBAR Const
+contract: Type Ident Is VBAR Const
 ##
 ## Ends in an error in state: 25.
 ##
-## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## option(VBAR)
@@ -1804,2685 +4567,11 @@ interactive_expr: LPAR Unit COLON VBAR Const
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
-interactive_expr: LPAR Unit COLON With
-##
-## Ends in an error in state: 340.
-##
-## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## LPAR disj_expr COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit COMMA With
-##
-## Ends in an error in state: 337.
-##
-## tuple_comp -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
-##
-## The known suffix of the stack is as follows:
-## expr COMMA
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR Unit VBAR
-##
-## Ends in an error in state: 339.
-##
-## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## disj_expr -> disj_expr . Or conj_expr [ RPAR Or COMMA COLON ]
-## expr -> disj_expr . [ RPAR COMMA ]
-##
-## The known suffix of the stack is as follows:
-## LPAR disj_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: LPAR With
-##
-## Ends in an error in state: 88.
-##
-## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## LPAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List LBRACKET Unit End
-##
-## Ends in an error in state: 345.
-##
-## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List LBRACKET With
-##
-## Ends in an error in state: 343.
-##
-## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit RBRACKET
-##
-## Ends in an error in state: 357.
-##
-## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit SEMI Unit SEMI With
-##
-## Ends in an error in state: 354.
-##
-## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit SEMI Unit VBAR
-##
-## Ends in an error in state: 353.
-##
-## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
-## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit SEMI With
-##
-## Ends in an error in state: 350.
-##
-## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List Unit VBAR
-##
-## Ends in an error in state: 349.
-##
-## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
-## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(expr,SEMI)) -> expr . SEMI seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: List With
-##
-## Ends in an error in state: 87.
-##
-## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## List
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: MINUS With
-##
-## Ends in an error in state: 86.
-##
-## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## MINUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map LBRACKET Unit ARROW Bytes End
-##
-## Ends in an error in state: 362.
-##
-## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map LBRACKET With
-##
-## Ends in an error in state: 360.
-##
-## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes RBRACKET
-##
-## Ends in an error in state: 365.
-##
-## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
-##
-## Ends in an error in state: 234.
-##
-## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
-##
-## Ends in an error in state: 233.
-##
-## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
-## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes SEMI With
-##
-## Ends in an error in state: 230.
-##
-## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW Bytes VBAR
-##
-## Ends in an error in state: 229.
-##
-## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
-## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(binding,SEMI)) -> binding . SEMI seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## binding
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit ARROW With
-##
-## Ends in an error in state: 227.
-##
-## binding -> expr ARROW . expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map Unit VBAR
-##
-## Ends in an error in state: 226.
-##
-## binding -> expr . ARROW expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Map With
-##
-## Ends in an error in state: 85.
-##
-## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Not Bytes With
-##
-## Ends in an error in state: 153.
-##
-## add_expr -> mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Not With
-##
-## Ends in an error in state: 81.
-##
-## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Not
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes RBRACKET
-##
-## Ends in an error in state: 380.
-##
-## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
-##
-## Ends in an error in state: 378.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 377.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
-## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes SEMI With
-##
-## Ends in an error in state: 374.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 373.
-##
-## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
-## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment . SEMI seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## field_assignment
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident EQ With
-##
-## Ends in an error in state: 80.
-##
-## field_assignment -> Ident EQ . expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## Ident EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record Ident With
-##
-## Ends in an error in state: 79.
-##
-## field_assignment -> Ident . EQ expr [ SEMI RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record LBRACKET Ident EQ Bytes End
-##
-## Ends in an error in state: 369.
-##
-## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record LBRACKET With
-##
-## Ends in an error in state: 78.
-##
-## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Record With
-##
-## Ends in an error in state: 77.
-##
-## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Record
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Recursive From
-##
-## Ends in an error in state: 132.
-##
-## fun_expr -> option(Recursive) . Function parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set LBRACKET Unit End
-##
-## Ends in an error in state: 384.
-##
-## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set LBRACKET With
-##
-## Ends in an error in state: 382.
-##
-## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set Unit RBRACKET
-##
-## Ends in an error in state: 387.
-##
-## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Set With
-##
-## Ends in an error in state: 76.
-##
-## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit And With
-##
-## Ends in an error in state: 203.
-##
-## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## conj_expr And
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit CAT With
-##
-## Ends in an error in state: 179.
-##
-## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## cons_expr CAT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit COLON
-##
-## Ends in an error in state: 173.
-##
-## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## expr -> disj_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-##
-## The known suffix of the stack is as follows:
-## disj_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit CONS With
-##
-## Ends in an error in state: 186.
-##
-## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr CONS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Contains With
-##
-## Ends in an error in state: 176.
-##
-## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_expr Contains
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit EQ With
-##
-## Ends in an error in state: 199.
-##
-## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit GE With
-##
-## Ends in an error in state: 197.
-##
-## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr GE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit GT With
-##
-## Ends in an error in state: 195.
-##
-## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr GT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit LE With
-##
-## Ends in an error in state: 193.
-##
-## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr LE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit LT With
-##
-## Ends in an error in state: 191.
-##
-## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr LT
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit MINUS Unit With
-##
-## Ends in an error in state: 185.
-##
-## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr MINUS mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit MINUS With
-##
-## Ends in an error in state: 184.
-##
-## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr MINUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Mod With
-##
-## Ends in an error in state: 169.
-##
-## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr Mod
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit NE With
-##
-## Ends in an error in state: 189.
-##
-## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## comp_expr NE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit Or With
-##
-## Ends in an error in state: 174.
-##
-## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
-##
-## The known suffix of the stack is as follows:
-## disj_expr Or
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit PLUS Unit With
-##
-## Ends in an error in state: 183.
-##
-## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr PLUS mult_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit PLUS With
-##
-## Ends in an error in state: 182.
-##
-## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## add_expr PLUS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit SLASH With
-##
-## Ends in an error in state: 167.
-##
-## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr SLASH
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit TIMES With
-##
-## Ends in an error in state: 154.
-##
-## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## mult_expr TIMES
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit VBAR
-##
-## Ends in an error in state: 573.
-##
-## interactive_expr -> expr . EOF [ # ]
-##
-## The known suffix of the stack is as follows:
-## expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: Unit With
-##
-## Ends in an error in state: 175.
-##
-## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-##
-## The known suffix of the stack is as follows:
-## core_expr
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-interactive_expr: With
-##
-## Ends in an error in state: 571.
-##
-## interactive_expr' -> . interactive_expr [ # ]
-##
-## The known suffix of the stack is as follows:
-##
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes LBRACKET String End
-##
-## Ends in an error in state: 400.
-##
-## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes LBRACKET sep_or_term_list(String,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 392, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 403, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes LBRACKET With
-##
-## Ends in an error in state: 399.
-##
-## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End Attributes String End SEMI With
-##
-## Ends in an error in state: 566.
-##
-## seq(declaration) -> declaration . seq(declaration) [ EOF ]
-##
-## The known suffix of the stack is as follows:
-## declaration
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End SEMI With
-##
-## Ends in an error in state: 564.
-##
-## nseq(declaration) -> declaration . seq(declaration) [ EOF ]
-##
-## The known suffix of the stack is as follows:
-## declaration
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String End With
-##
-## Ends in an error in state: 559.
-##
-## attr_decl -> open_attr_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_attr_decl
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String RBRACKET
-##
-## Ends in an error in state: 404.
-##
-## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes sep_or_term_list(String,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 392, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 403, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI String SEMI With
-##
-## Ends in an error in state: 395.
-##
-## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI String With
-##
-## Ends in an error in state: 394.
-##
-## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
-## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
-## seq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String SEMI With
-##
-## Ends in an error in state: 393.
-##
-## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes String With
-##
-## Ends in an error in state: 392.
-##
-## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
-## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
-## nseq(__anonymous_0(String,SEMI)) -> String . SEMI seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## String
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Attributes With
-##
-## Ends in an error in state: 391.
-##
-## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Attributes
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident EQ Bytes VBAR
-##
-## Ends in an error in state: 557.
-##
-## const_decl -> open_const_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_const_decl
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 389, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
-## In state 390, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident EQ With
-##
-## Ends in an error in state: 72.
-##
-## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr EQ
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON Ident VBAR
-##
-## Ends in an error in state: 71.
-##
-## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident COLON With
-##
-## Ends in an error in state: 70.
-##
-## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const Ident With
-##
-## Ends in an error in state: 69.
-##
-## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Const With
-##
-## Ends in an error in state: 68.
-##
-## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Const
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET VBAR Block
-##
-## Ends in an error in state: 488.
-##
-## case(if_clause) -> Case expr Of LBRACKET option(VBAR) . cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET option(VBAR)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET WILD ARROW Skip End
-##
-## Ends in an error in state: 516.
-##
-## case(if_clause) -> Case expr Of LBRACKET option(VBAR) cases(if_clause) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET option(VBAR) cases(if_clause)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 518, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 515, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET With
-##
-## Ends in an error in state: 487.
-##
-## case(if_clause) -> Case expr Of LBRACKET . option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of VBAR Block
-##
-## Ends in an error in state: 521.
-##
-## case(if_clause) -> Case expr Of option(VBAR) . cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of option(VBAR)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip RBRACKET
-##
-## Ends in an error in state: 522.
-##
-## case(if_clause) -> Case expr Of option(VBAR) cases(if_clause) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of option(VBAR) cases(if_clause)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 518, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 515, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip VBAR With
-##
-## Ends in an error in state: 519.
-##
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) VBAR . nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## case_clause(if_clause) VBAR
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip With
-##
-## Ends in an error in state: 518.
-##
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . [ RBRACKET End ]
-## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . VBAR nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## case_clause(if_clause)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW With
-##
-## Ends in an error in state: 490.
-##
-## case_clause(if_clause) -> pattern ARROW . if_clause [ VBAR RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## pattern ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD RPAR
-##
-## Ends in an error in state: 489.
-##
-## case_clause(if_clause) -> pattern . ARROW if_clause [ VBAR RBRACKET End ]
-##
-## The known suffix of the stack is as follows:
-## pattern
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 278, spurious reduction of production pattern -> core_pattern 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of With
-##
-## Ends in an error in state: 486.
-##
-## case(if_clause) -> Case expr Of . option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case expr Of . LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr Of
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit VBAR
-##
-## Ends in an error in state: 485.
-##
-## case(if_clause) -> Case expr . Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case expr . Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case With
-##
-## Ends in an error in state: 484.
-##
-## case(if_clause) -> Case . expr Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## case(if_clause) -> Case . expr Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Case
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW Ident With
-##
-## Ends in an error in state: 471.
-##
-## for_loop -> For Ident option(arrow_clause) . In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW With
-##
-## Ends in an error in state: 469.
-##
-## arrow_clause -> ARROW . Ident [ In ]
-##
-## The known suffix of the stack is as follows:
-## ARROW
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To Unit VBAR
-##
-## Ends in an error in state: 482.
-##
-## for_loop -> For var_assign To expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign To expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To With
-##
-## Ends in an error in state: 481.
-##
-## for_loop -> For var_assign To . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign To
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes VBAR
-##
-## Ends in an error in state: 480.
-##
-## for_loop -> For var_assign . To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For var_assign
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 468, spurious reduction of production var_assign -> Ident ASS expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS With
-##
-## Ends in an error in state: 467.
-##
-## var_assign -> Ident ASS . expr [ To ]
-##
-## The known suffix of the stack is as follows:
-## Ident ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set Unit VBAR
-##
-## Ends in an error in state: 477.
-##
-## for_loop -> For Ident option(arrow_clause) In collection expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In collection expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set With
-##
-## Ends in an error in state: 476.
-##
-## for_loop -> For Ident option(arrow_clause) In collection . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In collection
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In With
-##
-## Ends in an error in state: 472.
-##
-## for_loop -> For Ident option(arrow_clause) In . collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For Ident option(arrow_clause) In
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident With
-##
-## Ends in an error in state: 466.
-##
-## for_loop -> For Ident . option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-## var_assign -> Ident . ASS expr [ To ]
-##
-## The known suffix of the stack is as follows:
-## For Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For With
-##
-## Ends in an error in state: 465.
-##
-## for_loop -> For . var_assign To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-## for_loop -> For . Ident option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## For
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident ASS With
-##
-## Ends in an error in state: 502.
-##
-## assignment -> lhs ASS . rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## lhs ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident DOT Ident With
-##
-## Ends in an error in state: 496.
-##
-## lhs -> path . [ ASS ]
-## map_lookup -> path . brackets(expr) [ ASS ]
-##
-## The known suffix of the stack is as follows:
-## path
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 322, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 325, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
-## In state 432, spurious reduction of production path -> projection 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident LBRACKET Bytes RBRACKET With
-##
-## Ends in an error in state: 501.
-##
-## assignment -> lhs . ASS rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## lhs
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident With
-##
-## Ends in an error in state: 464.
-##
-## fun_call -> Ident . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
-## path -> Ident . [ LBRACKET ASS ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE Skip End
-##
-## Ends in an error in state: 538.
-##
-## clause_block -> LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## LBRACE sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE With
-##
-## Ends in an error in state: 463.
-##
-## clause_block -> LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## LBRACE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip Else With
-##
-## Ends in an error in state: 544.
-##
-## conditional -> If expr Then if_clause option(SEMI) Else . if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause option(SEMI) Else
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip SEMI EQ
-##
-## Ends in an error in state: 543.
-##
-## conditional -> If expr Then if_clause option(SEMI) . Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause option(SEMI)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip With
-##
-## Ends in an error in state: 542.
-##
-## conditional -> If expr Then if_clause . option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then if_clause
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then With
-##
-## Ends in an error in state: 462.
-##
-## conditional -> If expr Then . if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr Then
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit VBAR
-##
-## Ends in an error in state: 461.
-##
-## conditional -> If expr . Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If With
-##
-## Ends in an error in state: 460.
-##
-## conditional -> If . expr Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## If
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident VBAR
-##
-## Ends in an error in state: 437.
-##
-## map_patch -> Patch path . With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch path . With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch path . With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch path
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 431, spurious reduction of production path -> Ident 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident While
-##
-## Ends in an error in state: 431.
-##
-## path -> Ident . [ With VBAR SEMI RBRACKET RBRACE End Else ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET Unit ARROW Bytes End
-##
-## Ends in an error in state: 453.
-##
-## ne_injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET With
-##
-## Ends in an error in state: 452.
-##
-## ne_injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map Unit ARROW Bytes RBRACKET
-##
-## Ends in an error in state: 455.
-##
-## ne_injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map sep_or_term_list(binding,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 228, spurious reduction of production binding -> expr ARROW expr 
-## In state 229, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 225, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map With
-##
-## Ends in an error in state: 451.
-##
-## ne_injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record Ident EQ Bytes RBRACKET
-##
-## Ends in an error in state: 449.
-##
-## ne_injection(Record,field_assignment) -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET Ident EQ Bytes End
-##
-## Ends in an error in state: 447.
-##
-## ne_injection(Record,field_assignment) -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 368, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 373, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 372, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET With
-##
-## Ends in an error in state: 446.
-##
-## ne_injection(Record,field_assignment) -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record With
-##
-## Ends in an error in state: 445.
-##
-## ne_injection(Record,field_assignment) -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Record,field_assignment) -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Record
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET Unit End
-##
-## Ends in an error in state: 441.
-##
-## ne_injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET With
-##
-## Ends in an error in state: 440.
-##
-## ne_injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set LBRACKET
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set Unit RBRACKET
-##
-## Ends in an error in state: 443.
-##
-## ne_injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set sep_or_term_list(expr,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 349, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 348, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set With
-##
-## Ends in an error in state: 439.
-##
-## ne_injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
-## ne_injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With With
-##
-## Ends in an error in state: 438.
-##
-## map_patch -> Patch path With . ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch path With . ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch path With . ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch path With
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch With
-##
-## Ends in an error in state: 436.
-##
-## map_patch -> Patch . path With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## record_patch -> Patch . path With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_patch -> Patch . path With ne_injection(Set,expr) [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Patch
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Map With
-##
-## Ends in an error in state: 434.
-##
-## map_remove -> Remove expr From Map . path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From Map
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Set With
-##
-## Ends in an error in state: 430.
-##
-## set_remove -> Remove expr From Set . path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From Set
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From With
-##
-## Ends in an error in state: 429.
-##
-## map_remove -> Remove expr From . Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove expr From . Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr From
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit VBAR
-##
-## Ends in an error in state: 428.
-##
-## map_remove -> Remove expr . From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove expr . From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove With
-##
-## Ends in an error in state: 427.
-##
-## map_remove -> Remove . expr From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
-## set_remove -> Remove . expr From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Remove
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
-##
-## Ends in an error in state: 552.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters COLON type_expr Is block
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
-##
-## Ends in an error in state: 553.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters COLON type_expr Is block With
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip RBRACE
-##
-## Ends in an error in state: 546.
-##
-## block -> Begin sep_or_term_list(statement,SEMI) . End [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Begin sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip SEMI With
-##
-## Ends in an error in state: 527.
-##
-## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
-## seq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip With
-##
-## Ends in an error in state: 526.
-##
-## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
-## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
-## seq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI With
-##
-## Ends in an error in state: 525.
-##
-## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
-## nseq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement SEMI
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip With
-##
-## Ends in an error in state: 524.
-##
-## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
-## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
-## nseq(__anonymous_0(statement,SEMI)) -> statement . SEMI seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## statement
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident ASS With
-##
-## Ends in an error in state: 423.
-##
-## unqualified_decl(ASS) -> Ident COLON type_expr ASS . expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr ASS
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident VBAR
-##
-## Ends in an error in state: 422.
-##
-## unqualified_decl(ASS) -> Ident COLON type_expr . ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON With
-##
-## Ends in an error in state: 421.
-##
-## unqualified_decl(ASS) -> Ident COLON . type_expr ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident With
-##
-## Ends in an error in state: 420.
-##
-## unqualified_decl(ASS) -> Ident . COLON type_expr ASS expr [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var With
-##
-## Ends in an error in state: 419.
-##
-## open_var_decl -> Var . unqualified_decl(ASS) [ SEMI RBRACE End ]
-##
-## The known suffix of the stack is as follows:
-## Var
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While Unit VBAR
-##
-## Ends in an error in state: 417.
-##
-## while_loop -> While expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## While expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While With
-##
-## Ends in an error in state: 416.
-##
-## while_loop -> While . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## While
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin With
-##
-## Ends in an error in state: 418.
-##
-## block -> Begin . sep_or_term_list(statement,SEMI) End [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Begin
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE Skip End
-##
-## Ends in an error in state: 549.
-##
-## block -> Block LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block LBRACE sep_or_term_list(statement,SEMI)
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 524, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 541, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE With
-##
-## Ends in an error in state: 415.
-##
-## block -> Block LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block LBRACE
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block With
-##
-## Ends in an error in state: 414.
-##
-## block -> Block . LBRACE sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
-##
-## The known suffix of the stack is as follows:
-## Block
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes VBAR
-##
-## Ends in an error in state: 555.
-##
-## fun_decl -> open_fun_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## open_fun_decl
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 175, spurious reduction of production unary_expr -> core_expr 
-## In state 106, spurious reduction of production mult_expr -> unary_expr 
-## In state 153, spurious reduction of production add_expr -> mult_expr 
-## In state 181, spurious reduction of production cons_expr -> add_expr 
-## In state 178, spurious reduction of production cat_expr -> cons_expr 
-## In state 201, spurious reduction of production comp_expr -> cat_expr 
-## In state 188, spurious reduction of production set_membership -> comp_expr 
-## In state 108, spurious reduction of production conj_expr -> set_membership 
-## In state 205, spurious reduction of production disj_expr -> conj_expr 
-## In state 173, spurious reduction of production expr -> disj_expr 
-## In state 551, spurious reduction of production open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is expr 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
-##
-## Ends in an error in state: 413.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr Is . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters COLON type_expr Is
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
-##
-## Ends in an error in state: 412.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON type_expr . Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters COLON type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
-##
-## Ends in an error in state: 411.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function Ident parameters COLON . type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters COLON
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident LPAR Const Ident COLON Ident RPAR With
-##
-## Ends in an error in state: 410.
-##
-## open_fun_decl -> option(Recursive) Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function Ident parameters . COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident parameters
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function Ident With
-##
-## Ends in an error in state: 409.
-##
-## open_fun_decl -> option(Recursive) Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function Ident . parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function Ident
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Function With
-##
-## Ends in an error in state: 408.
-##
-## open_fun_decl -> option(Recursive) Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) Function . Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive) Function
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Recursive With
-##
-## Ends in an error in state: 407.
-##
-## open_fun_decl -> option(Recursive) . Function Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> option(Recursive) . Function Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## option(Recursive)
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
-contract: Type Ident Is Ident VBAR
-##
-## Ends in an error in state: 64.
-##
-## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
-##
-## The known suffix of the stack is as follows:
-## Type Ident Is type_expr
-##
-## WARNING: This example involves spurious reductions.
-## This implies that, although the LR(1) items shown above provide an
-## accurate view of the past (what has been recognized so far), they
-## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 15, spurious reduction of production core_type -> Ident 
-## In state 29, spurious reduction of production cartesian -> core_type 
-## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 43, spurious reduction of production type_expr -> fun_type 
-##
-
-<YOUR SYNTAX ERROR MESSAGE HERE>
-
 contract: Type Ident Is With
 ##
 ## Ends in an error in state: 3.
 ##
-## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident Is
@@ -4494,7 +4583,7 @@ contract: Type Ident With
 ##
 ## Ends in an error in state: 2.
 ##
-## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident
@@ -4506,7 +4595,7 @@ contract: Type With
 ##
 ## Ends in an error in state: 1.
 ##
-## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
+## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type

From 8a183ff1d2670e6e026f874d8094fa1a050e3241 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Tue, 10 Mar 2020 10:21:12 +0100
Subject: [PATCH 20/43] Fixing error.messages.

---
 .../cameligo/error.messages.checked-in        | 1437 ++++++-----
 .../pascaligo/error.messages.checked-in       | 2237 +++++++++--------
 .../reasonligo/error.messages.checked-in      | 1444 +++++------
 3 files changed, 2690 insertions(+), 2428 deletions(-)

diff --git a/src/passes/1-parser/cameligo/error.messages.checked-in b/src/passes/1-parser/cameligo/error.messages.checked-in
index b81356f73..270e55960 100644
--- a/src/passes/1-parser/cameligo/error.messages.checked-in
+++ b/src/passes/1-parser/cameligo/error.messages.checked-in
@@ -1,6 +1,6 @@
 interactive_expr: Begin True RBRACKET
 ##
-## Ends in an error in state: 215.
+## Ends in an error in state: 218.
 ##
 ## sequence -> Begin option(sep_or_term_list(expr,SEMI)) . End [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -11,28 +11,28 @@ interactive_expr: Begin True RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 240, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 218, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-## In state 214, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 243, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 221, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 217, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Begin With
 ##
-## Ends in an error in state: 198.
+## Ends in an error in state: 201.
 ##
 ## sequence -> Begin . option(sep_or_term_list(expr,SEMI)) End [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -44,7 +44,7 @@ interactive_expr: Begin With
 
 interactive_expr: C_None WILD
 ##
-## Ends in an error in state: 219.
+## Ends in an error in state: 222.
 ##
 ## add_expr_level -> mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -59,7 +59,7 @@ interactive_expr: C_None WILD
 
 interactive_expr: C_Some With
 ##
-## Ends in an error in state: 199.
+## Ends in an error in state: 202.
 ##
 ## constr_expr -> C_Some . core_expr [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -71,7 +71,7 @@ interactive_expr: C_Some With
 
 interactive_expr: Constr DOT Ident DOT With
 ##
-## Ends in an error in state: 194.
+## Ends in an error in state: 196.
 ##
 ## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -83,9 +83,9 @@ interactive_expr: Constr DOT Ident DOT With
 
 interactive_expr: Constr DOT Ident WILD
 ##
-## Ends in an error in state: 193.
+## Ends in an error in state: 195.
 ##
-## module_field -> Constr DOT Ident . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
+## module_fun -> Ident . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
 ## The known suffix of the stack is as follows:
@@ -96,9 +96,9 @@ interactive_expr: Constr DOT Ident WILD
 
 interactive_expr: Constr DOT With
 ##
-## Ends in an error in state: 192.
+## Ends in an error in state: 193.
 ##
-## module_field -> Constr DOT . Ident [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
+## module_field -> Constr DOT . module_fun [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
 ## The known suffix of the stack is as follows:
@@ -109,11 +109,11 @@ interactive_expr: Constr DOT With
 
 interactive_expr: Constr WILD
 ##
-## Ends in an error in state: 191.
+## Ends in an error in state: 192.
 ##
 ## constr_expr -> Constr . core_expr [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## constr_expr -> Constr . [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
-## module_field -> Constr . DOT Ident [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
+## module_field -> Constr . DOT module_fun [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
 ## The known suffix of the stack is as follows:
@@ -124,7 +124,7 @@ interactive_expr: Constr WILD
 
 interactive_expr: Fun WILD ARROW With
 ##
-## Ends in an error in state: 189.
+## Ends in an error in state: 190.
 ##
 ## fun_expr(expr) -> Fun nseq(irrefutable) ARROW . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -136,7 +136,7 @@ interactive_expr: Fun WILD ARROW With
 
 interactive_expr: Fun WILD RPAR
 ##
-## Ends in an error in state: 305.
+## Ends in an error in state: 308.
 ##
 ## nseq(irrefutable) -> irrefutable . seq(irrefutable) [ ARROW ]
 ##
@@ -147,14 +147,14 @@ interactive_expr: Fun WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 133, spurious reduction of production irrefutable -> sub_irrefutable 
+## In state 134, spurious reduction of production irrefutable -> sub_irrefutable 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Fun WILD WILD RPAR
 ##
-## Ends in an error in state: 307.
+## Ends in an error in state: 310.
 ##
 ## seq(irrefutable) -> irrefutable . seq(irrefutable) [ ARROW ]
 ##
@@ -165,14 +165,14 @@ interactive_expr: Fun WILD WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 133, spurious reduction of production irrefutable -> sub_irrefutable 
+## In state 134, spurious reduction of production irrefutable -> sub_irrefutable 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Fun With
 ##
-## Ends in an error in state: 187.
+## Ends in an error in state: 188.
 ##
 ## fun_expr(expr) -> Fun . nseq(irrefutable) ARROW expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -184,7 +184,7 @@ interactive_expr: Fun With
 
 interactive_expr: Ident DOT Int DOT With
 ##
-## Ends in an error in state: 184.
+## Ends in an error in state: 185.
 ##
 ## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -196,7 +196,7 @@ interactive_expr: Ident DOT Int DOT With
 
 interactive_expr: Ident DOT Int WILD
 ##
-## Ends in an error in state: 183.
+## Ends in an error in state: 184.
 ##
 ## nsepseq(selection,DOT) -> selection . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -209,7 +209,7 @@ interactive_expr: Ident DOT Int WILD
 
 interactive_expr: Ident DOT With
 ##
-## Ends in an error in state: 180.
+## Ends in an error in state: 181.
 ##
 ## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -221,7 +221,7 @@ interactive_expr: Ident DOT With
 
 interactive_expr: Ident WILD
 ##
-## Ends in an error in state: 179.
+## Ends in an error in state: 180.
 ##
 ## core_expr -> Ident . [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -234,7 +234,7 @@ interactive_expr: Ident WILD
 
 interactive_expr: If True Then Fun WILD ARROW With
 ##
-## Ends in an error in state: 423.
+## Ends in an error in state: 426.
 ##
 ## fun_expr(closed_if) -> Fun nseq(irrefutable) ARROW . closed_if [ Else ]
 ## fun_expr(expr) -> Fun nseq(irrefutable) ARROW . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -247,7 +247,7 @@ interactive_expr: If True Then Fun WILD ARROW With
 
 interactive_expr: If True Then Fun With
 ##
-## Ends in an error in state: 421.
+## Ends in an error in state: 424.
 ##
 ## fun_expr(closed_if) -> Fun . nseq(irrefutable) ARROW closed_if [ Else ]
 ## fun_expr(expr) -> Fun . nseq(irrefutable) ARROW expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -260,7 +260,7 @@ interactive_expr: If True Then Fun With
 
 interactive_expr: If True Then If True Then True Else With
 ##
-## Ends in an error in state: 428.
+## Ends in an error in state: 431.
 ##
 ## if_then_else(closed_if) -> If expr Then closed_if Else . closed_if [ Else ]
 ## if_then_else(expr) -> If expr Then closed_if Else . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -273,7 +273,7 @@ interactive_expr: If True Then If True Then True Else With
 
 interactive_expr: If True Then If True Then With
 ##
-## Ends in an error in state: 420.
+## Ends in an error in state: 423.
 ##
 ## if_then(expr) -> If expr Then . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr Then . closed_if Else closed_if [ Else ]
@@ -287,7 +287,7 @@ interactive_expr: If True Then If True Then With
 
 interactive_expr: If True Then If True With
 ##
-## Ends in an error in state: 419.
+## Ends in an error in state: 422.
 ##
 ## if_then(expr) -> If expr . Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr . Then closed_if Else closed_if [ Else ]
@@ -300,25 +300,25 @@ interactive_expr: If True Then If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then If With
 ##
-## Ends in an error in state: 418.
+## Ends in an error in state: 421.
 ##
 ## if_then(expr) -> If . expr Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If . expr Then closed_if Else closed_if [ Else ]
@@ -332,7 +332,7 @@ interactive_expr: If True Then If With
 
 interactive_expr: If True Then Let Rec WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 416.
+## Ends in an error in state: 419.
 ##
 ## let_expr(closed_if) -> Let Rec let_binding seq(Attr) . In closed_if [ Else ]
 ## let_expr(expr) -> Let Rec let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -344,15 +344,15 @@ interactive_expr: If True Then Let Rec WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let Rec WILD EQ Bytes In With
 ##
-## Ends in an error in state: 417.
+## Ends in an error in state: 420.
 ##
 ## let_expr(closed_if) -> Let Rec let_binding seq(Attr) In . closed_if [ Else ]
 ## let_expr(expr) -> Let Rec let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -365,7 +365,7 @@ interactive_expr: If True Then Let Rec WILD EQ Bytes In With
 
 interactive_expr: If True Then Let Rec WILD EQ Bytes With
 ##
-## Ends in an error in state: 415.
+## Ends in an error in state: 418.
 ##
 ## let_expr(closed_if) -> Let Rec let_binding . seq(Attr) In closed_if [ Else ]
 ## let_expr(expr) -> Let Rec let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -377,26 +377,26 @@ interactive_expr: If True Then Let Rec WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let Rec With
 ##
-## Ends in an error in state: 414.
+## Ends in an error in state: 417.
 ##
 ## let_expr(closed_if) -> Let Rec . let_binding seq(Attr) In closed_if [ Else ]
 ## let_expr(expr) -> Let Rec . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -409,7 +409,7 @@ interactive_expr: If True Then Let Rec With
 
 interactive_expr: If True Then Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 432.
+## Ends in an error in state: 435.
 ##
 ## let_expr(closed_if) -> Let let_binding seq(Attr) . In closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -421,15 +421,15 @@ interactive_expr: If True Then Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 433.
+## Ends in an error in state: 436.
 ##
 ## let_expr(closed_if) -> Let let_binding seq(Attr) In . closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -442,7 +442,7 @@ interactive_expr: If True Then Let WILD EQ Bytes In With
 
 interactive_expr: If True Then Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 431.
+## Ends in an error in state: 434.
 ##
 ## let_expr(closed_if) -> Let let_binding . seq(Attr) In closed_if [ Else ]
 ## let_expr(expr) -> Let let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -454,26 +454,26 @@ interactive_expr: If True Then Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Let With
 ##
-## Ends in an error in state: 413.
+## Ends in an error in state: 416.
 ##
 ## let_expr(closed_if) -> Let . let_binding seq(Attr) In closed_if [ Else ]
 ## let_expr(closed_if) -> Let . Rec let_binding seq(Attr) In closed_if [ Else ]
@@ -488,7 +488,7 @@ interactive_expr: If True Then Let With
 
 interactive_expr: If True Then Match True Type
 ##
-## Ends in an error in state: 312.
+## Ends in an error in state: 315.
 ##
 ## match_expr(base_cond) -> Match expr . With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr . With option(VBAR) cases(base_if_then_else) [ Else ]
@@ -500,25 +500,25 @@ interactive_expr: If True Then Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With VBAR Begin
 ##
-## Ends in an error in state: 315.
+## Ends in an error in state: 318.
 ##
 ## match_expr(base_cond) -> Match expr With option(VBAR) . cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr With option(VBAR) . cases(base_if_then_else) [ Else ]
@@ -531,7 +531,7 @@ interactive_expr: If True Then Match True With VBAR Begin
 
 interactive_expr: If True Then Match True With WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 342.
+## Ends in an error in state: 345.
 ##
 ## cases(base_cond) -> cases(base_cond) VBAR . case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## cases(base_if_then_else) -> cases(base_cond) VBAR . case_clause(base_if_then_else) [ Else ]
@@ -544,7 +544,7 @@ interactive_expr: If True Then Match True With WILD ARROW Bytes VBAR With
 
 interactive_expr: If True Then Match True With WILD ARROW Fun WILD ARROW With
 ##
-## Ends in an error in state: 395.
+## Ends in an error in state: 398.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(base_if_then_else) -> Fun nseq(irrefutable) ARROW . base_if_then_else [ Else ]
@@ -557,7 +557,7 @@ interactive_expr: If True Then Match True With WILD ARROW Fun WILD ARROW With
 
 interactive_expr: If True Then Match True With WILD ARROW Fun With
 ##
-## Ends in an error in state: 393.
+## Ends in an error in state: 396.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(base_if_then_else) -> Fun . nseq(irrefutable) ARROW base_if_then_else [ Else ]
@@ -570,7 +570,7 @@ interactive_expr: If True Then Match True With WILD ARROW Fun With
 
 interactive_expr: If True Then Match True With WILD ARROW If True Then True Else With
 ##
-## Ends in an error in state: 392.
+## Ends in an error in state: 395.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_if_then_else) -> If expr Then closed_if Else . base_if_then_else [ Else ]
@@ -583,7 +583,7 @@ interactive_expr: If True Then Match True With WILD ARROW If True Then True Else
 
 interactive_expr: If True Then Match True With WILD ARROW If True Then With
 ##
-## Ends in an error in state: 334.
+## Ends in an error in state: 337.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -597,7 +597,7 @@ interactive_expr: If True Then Match True With WILD ARROW If True Then With
 
 interactive_expr: If True Then Match True With WILD ARROW If True With
 ##
-## Ends in an error in state: 333.
+## Ends in an error in state: 336.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -610,25 +610,25 @@ interactive_expr: If True Then Match True With WILD ARROW If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW If With
 ##
-## Ends in an error in state: 332.
+## Ends in an error in state: 335.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -642,7 +642,7 @@ interactive_expr: If True Then Match True With WILD ARROW If With
 
 interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 330.
+## Ends in an error in state: 333.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let Rec let_binding seq(Attr) . In base_if_then_else [ Else ]
@@ -654,15 +654,15 @@ interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes In With
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 334.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let Rec let_binding seq(Attr) In . base_if_then_else [ Else ]
@@ -675,7 +675,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes
 
 interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes With
 ##
-## Ends in an error in state: 329.
+## Ends in an error in state: 332.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let Rec let_binding . seq(Attr) In base_if_then_else [ Else ]
@@ -687,26 +687,26 @@ interactive_expr: If True Then Match True With WILD ARROW Let Rec WILD EQ Bytes
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let Rec With
 ##
-## Ends in an error in state: 328.
+## Ends in an error in state: 331.
 ##
 ## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let Rec . let_binding seq(Attr) In base_if_then_else [ Else ]
@@ -719,7 +719,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let Rec With
 
 interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 407.
+## Ends in an error in state: 410.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding seq(Attr) . In base_if_then_else [ Else ]
@@ -731,15 +731,15 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes Attr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 408.
+## Ends in an error in state: 411.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding seq(Attr) In . base_if_then_else [ Else ]
@@ -752,7 +752,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes In W
 
 interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 406.
+## Ends in an error in state: 409.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_if_then_else) -> Let let_binding . seq(Attr) In base_if_then_else [ Else ]
@@ -764,26 +764,26 @@ interactive_expr: If True Then Match True With WILD ARROW Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With WILD ARROW Let With
 ##
-## Ends in an error in state: 327.
+## Ends in an error in state: 330.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -798,7 +798,7 @@ interactive_expr: If True Then Match True With WILD ARROW Let With
 
 interactive_expr: If True Then Match True With WILD ARROW With
 ##
-## Ends in an error in state: 326.
+## Ends in an error in state: 329.
 ##
 ## case_clause(base_cond) -> pattern ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## case_clause(base_if_then_else) -> pattern ARROW . base_if_then_else [ Else ]
@@ -811,7 +811,7 @@ interactive_expr: If True Then Match True With WILD ARROW With
 
 interactive_expr: If True Then Match True With WILD CONS Bytes SEMI
 ##
-## Ends in an error in state: 325.
+## Ends in an error in state: 328.
 ##
 ## case_clause(base_cond) -> pattern . ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## case_clause(base_if_then_else) -> pattern . ARROW base_if_then_else [ Else ]
@@ -823,15 +823,15 @@ interactive_expr: If True Then Match True With WILD CONS Bytes SEMI
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
-## In state 319, spurious reduction of production pattern -> sub_pattern CONS tail 
+## In state 95, spurious reduction of production tail -> sub_pattern 
+## In state 322, spurious reduction of production pattern -> sub_pattern CONS tail 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then Match True With With
 ##
-## Ends in an error in state: 313.
+## Ends in an error in state: 316.
 ##
 ## match_expr(base_cond) -> Match expr With . option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match expr With . option(VBAR) cases(base_if_then_else) [ Else ]
@@ -844,7 +844,7 @@ interactive_expr: If True Then Match True With With
 
 interactive_expr: If True Then Match With
 ##
-## Ends in an error in state: 311.
+## Ends in an error in state: 314.
 ##
 ## match_expr(base_cond) -> Match . expr With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_if_then_else) -> Match . expr With option(VBAR) cases(base_if_then_else) [ Else ]
@@ -857,7 +857,7 @@ interactive_expr: If True Then Match With
 
 interactive_expr: If True Then True COMMA Bytes VBAR
 ##
-## Ends in an error in state: 424.
+## Ends in an error in state: 427.
 ##
 ## base_expr(closed_if) -> tuple_expr . [ Else ]
 ## base_expr(expr) -> tuple_expr . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -869,25 +869,25 @@ interactive_expr: If True Then True COMMA Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 292, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
-## In state 291, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
-## In state 213, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 295, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
+## In state 294, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
+## In state 216, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then True Else With
 ##
-## Ends in an error in state: 436.
+## Ends in an error in state: 439.
 ##
 ## if_then_else(expr) -> If expr Then closed_if Else . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -899,7 +899,7 @@ interactive_expr: If True Then True Else With
 
 interactive_expr: If True Then True VBAR
 ##
-## Ends in an error in state: 425.
+## Ends in an error in state: 428.
 ##
 ## base_expr(closed_if) -> disj_expr_level . [ Else ]
 ## base_expr(expr) -> disj_expr_level . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -914,22 +914,22 @@ interactive_expr: If True Then True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If True Then With
 ##
-## Ends in an error in state: 310.
+## Ends in an error in state: 313.
 ##
 ## if_then(expr) -> If expr Then . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If expr Then . closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -942,7 +942,7 @@ interactive_expr: If True Then With
 
 interactive_expr: If True With
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 312.
 ##
 ## if_then(expr) -> If expr . Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If expr . Then closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -954,25 +954,25 @@ interactive_expr: If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If With
 ##
-## Ends in an error in state: 178.
+## Ends in an error in state: 179.
 ##
 ## if_then(expr) -> If . expr Then expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(expr) -> If . expr Then closed_if Else expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -985,7 +985,7 @@ interactive_expr: If With
 
 interactive_expr: LBRACE Constr DOT Ident With
 ##
-## Ends in an error in state: 440.
+## Ends in an error in state: 443.
 ##
 ## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -997,7 +997,7 @@ interactive_expr: LBRACE Constr DOT Ident With
 
 interactive_expr: LBRACE Constr DOT With
 ##
-## Ends in an error in state: 439.
+## Ends in an error in state: 442.
 ##
 ## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -1009,7 +1009,7 @@ interactive_expr: LBRACE Constr DOT With
 
 interactive_expr: LBRACE Constr With
 ##
-## Ends in an error in state: 438.
+## Ends in an error in state: 441.
 ##
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With ]
 ##
@@ -1021,7 +1021,7 @@ interactive_expr: LBRACE Constr With
 
 interactive_expr: LBRACE Ident DOT Ident VBAR
 ##
-## Ends in an error in state: 444.
+## Ends in an error in state: 447.
 ##
 ## update_record -> LBRACE path . With sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1032,16 +1032,16 @@ interactive_expr: LBRACE Ident DOT Ident VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 183, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 186, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
-## In state 443, spurious reduction of production path -> projection 
+## In state 184, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 187, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 446, spurious reduction of production path -> projection 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 471.
+## Ends in an error in state: 474.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACE ]
@@ -1054,7 +1054,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 ##
-## Ends in an error in state: 470.
+## Ends in an error in state: 473.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACE ]
@@ -1067,26 +1067,26 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 437, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 440, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI Ident With
 ##
-## Ends in an error in state: 467.
+## Ends in an error in state: 470.
 ##
 ## field_assignment -> Ident . EQ expr [ SEMI RBRACE ]
 ##
@@ -1098,7 +1098,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI Ident With
 
 interactive_expr: LBRACE Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 466.
+## Ends in an error in state: 469.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACE ]
@@ -1111,7 +1111,7 @@ interactive_expr: LBRACE Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident EQ Bytes With
 ##
-## Ends in an error in state: 465.
+## Ends in an error in state: 468.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACE ]
@@ -1124,26 +1124,26 @@ interactive_expr: LBRACE Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 437, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 440, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident EQ With
 ##
-## Ends in an error in state: 176.
+## Ends in an error in state: 177.
 ##
 ## field_assignment -> Ident EQ . expr [ SEMI RBRACE ]
 ##
@@ -1155,7 +1155,7 @@ interactive_expr: LBRACE Ident EQ With
 
 interactive_expr: LBRACE Ident WILD
 ##
-## Ends in an error in state: 175.
+## Ends in an error in state: 176.
 ##
 ## field_assignment -> Ident . EQ expr [ SEMI RBRACE ]
 ## path -> Ident . [ With ]
@@ -1169,7 +1169,7 @@ interactive_expr: LBRACE Ident WILD
 
 interactive_expr: LBRACE Ident With Ident DOT With
 ##
-## Ends in an error in state: 447.
+## Ends in an error in state: 450.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ EQ ]
 ##
@@ -1181,7 +1181,7 @@ interactive_expr: LBRACE Ident With Ident DOT With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 461.
+## Ends in an error in state: 464.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACE ]
@@ -1194,7 +1194,7 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes With
 ##
-## Ends in an error in state: 460.
+## Ends in an error in state: 463.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACE ]
@@ -1207,26 +1207,26 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 455, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 458, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 457.
+## Ends in an error in state: 460.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACE ]
@@ -1239,7 +1239,7 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes SEMI With
 
 interactive_expr: LBRACE Ident With Ident EQ Bytes With
 ##
-## Ends in an error in state: 456.
+## Ends in an error in state: 459.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACE ]
@@ -1252,26 +1252,26 @@ interactive_expr: LBRACE Ident With Ident EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 455, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 458, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident With Ident EQ With
 ##
-## Ends in an error in state: 454.
+## Ends in an error in state: 457.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) EQ . expr [ SEMI RBRACE ]
 ##
@@ -1283,7 +1283,7 @@ interactive_expr: LBRACE Ident With Ident EQ With
 
 interactive_expr: LBRACE Ident With Ident With
 ##
-## Ends in an error in state: 446.
+## Ends in an error in state: 449.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ EQ ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ EQ ]
@@ -1296,7 +1296,7 @@ interactive_expr: LBRACE Ident With Ident With
 
 interactive_expr: LBRACE Ident With With
 ##
-## Ends in an error in state: 445.
+## Ends in an error in state: 448.
 ##
 ## update_record -> LBRACE path With . sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1308,7 +1308,7 @@ interactive_expr: LBRACE Ident With With
 
 interactive_expr: LBRACE With
 ##
-## Ends in an error in state: 174.
+## Ends in an error in state: 175.
 ##
 ## record_expr -> LBRACE . sep_or_term_list(field_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## update_record -> LBRACE . path With sep_or_term_list(field_path_assignment,SEMI) RBRACE [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -1321,7 +1321,7 @@ interactive_expr: LBRACE With
 
 interactive_expr: LBRACKET True End
 ##
-## Ends in an error in state: 476.
+## Ends in an error in state: 479.
 ##
 ## list__(expr) -> LBRACKET option(sep_or_term_list(expr,SEMI)) . RBRACKET [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1332,28 +1332,28 @@ interactive_expr: LBRACKET True End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 240, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 218, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
-## In state 214, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 243, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 221, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 217, spurious reduction of production option(sep_or_term_list(expr,SEMI)) -> sep_or_term_list(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True SEMI True SEMI With
 ##
-## Ends in an error in state: 245.
+## Ends in an error in state: 248.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -1366,7 +1366,7 @@ interactive_expr: LBRACKET True SEMI True SEMI With
 
 interactive_expr: LBRACKET True SEMI True With
 ##
-## Ends in an error in state: 244.
+## Ends in an error in state: 247.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -1379,25 +1379,25 @@ interactive_expr: LBRACKET True SEMI True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True SEMI With
 ##
-## Ends in an error in state: 241.
+## Ends in an error in state: 244.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -1410,7 +1410,7 @@ interactive_expr: LBRACKET True SEMI With
 
 interactive_expr: LBRACKET True With
 ##
-## Ends in an error in state: 240.
+## Ends in an error in state: 243.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -1423,25 +1423,25 @@ interactive_expr: LBRACKET True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET With
 ##
-## Ends in an error in state: 166.
+## Ends in an error in state: 167.
 ##
 ## list__(expr) -> LBRACKET . option(sep_or_term_list(expr,SEMI)) RBRACKET [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1453,7 +1453,7 @@ interactive_expr: LBRACKET With
 
 interactive_expr: LPAR True COLON Ident VBAR
 ##
-## Ends in an error in state: 507.
+## Ends in an error in state: 510.
 ##
 ## par(__anonymous_1) -> LPAR expr COLON type_expr . RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1473,7 +1473,7 @@ interactive_expr: LPAR True COLON Ident VBAR
 
 interactive_expr: LPAR True COLON With
 ##
-## Ends in an error in state: 506.
+## Ends in an error in state: 509.
 ##
 ## par(__anonymous_1) -> LPAR expr COLON . type_expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
@@ -1485,7 +1485,7 @@ interactive_expr: LPAR True COLON With
 
 interactive_expr: LPAR True With
 ##
-## Ends in an error in state: 504.
+## Ends in an error in state: 507.
 ##
 ## par(__anonymous_1) -> LPAR expr . COLON type_expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## par(expr) -> LPAR expr . RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -1497,25 +1497,25 @@ interactive_expr: LPAR True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR With
 ##
-## Ends in an error in state: 163.
+## Ends in an error in state: 164.
 ##
 ## par(__anonymous_1) -> LPAR . expr COLON type_expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## par(expr) -> LPAR . expr RPAR [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
@@ -1529,7 +1529,7 @@ interactive_expr: LPAR With
 
 interactive_expr: Let Rec WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 172.
+## Ends in an error in state: 173.
 ##
 ## let_expr(expr) -> Let Rec let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1540,15 +1540,15 @@ interactive_expr: Let Rec WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let Rec WILD EQ Bytes In With
 ##
-## Ends in an error in state: 173.
+## Ends in an error in state: 174.
 ##
 ## let_expr(expr) -> Let Rec let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1560,7 +1560,7 @@ interactive_expr: Let Rec WILD EQ Bytes In With
 
 interactive_expr: Let Rec WILD EQ Bytes With
 ##
-## Ends in an error in state: 169.
+## Ends in an error in state: 170.
 ##
 ## let_expr(expr) -> Let Rec let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1571,26 +1571,26 @@ interactive_expr: Let Rec WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let Rec With
 ##
-## Ends in an error in state: 168.
+## Ends in an error in state: 169.
 ##
 ## let_expr(expr) -> Let Rec . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1602,7 +1602,7 @@ interactive_expr: Let Rec With
 
 interactive_expr: Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 474.
+## Ends in an error in state: 477.
 ##
 ## let_expr(expr) -> Let let_binding seq(Attr) . In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1613,15 +1613,15 @@ interactive_expr: Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 475.
+## Ends in an error in state: 478.
 ##
 ## let_expr(expr) -> Let let_binding seq(Attr) In . expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1633,7 +1633,7 @@ interactive_expr: Let WILD EQ Bytes In With
 
 interactive_expr: Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 473.
+## Ends in an error in state: 476.
 ##
 ## let_expr(expr) -> Let let_binding . seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1644,26 +1644,26 @@ interactive_expr: Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let With
 ##
-## Ends in an error in state: 167.
+## Ends in an error in state: 168.
 ##
 ## let_expr(expr) -> Let . let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(expr) -> Let . Rec let_binding seq(Attr) In expr [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1676,7 +1676,7 @@ interactive_expr: Let With
 
 interactive_expr: MINUS With
 ##
-## Ends in an error in state: 165.
+## Ends in an error in state: 166.
 ##
 ## unary_expr_level -> MINUS . call_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -1688,7 +1688,7 @@ interactive_expr: MINUS With
 
 interactive_expr: Match True Type
 ##
-## Ends in an error in state: 479.
+## Ends in an error in state: 482.
 ##
 ## match_expr(base_cond) -> Match expr . With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1699,25 +1699,25 @@ interactive_expr: Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With LPAR Bytes RPAR With
 ##
-## Ends in an error in state: 317.
+## Ends in an error in state: 320.
 ##
 ## pattern -> sub_pattern . CONS tail [ ARROW ]
 ## tuple(sub_pattern) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ ARROW ]
@@ -1730,7 +1730,7 @@ interactive_expr: Match True With LPAR Bytes RPAR With
 
 interactive_expr: Match True With VBAR Begin
 ##
-## Ends in an error in state: 481.
+## Ends in an error in state: 484.
 ##
 ## match_expr(base_cond) -> Match expr With option(VBAR) . cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1742,7 +1742,7 @@ interactive_expr: Match True With VBAR Begin
 
 interactive_expr: Match True With WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 503.
+## Ends in an error in state: 506.
 ##
 ## cases(base_cond) -> cases(base_cond) VBAR . case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1754,7 +1754,7 @@ interactive_expr: Match True With WILD ARROW Bytes VBAR With
 
 interactive_expr: Match True With WILD ARROW Fun WILD ARROW With
 ##
-## Ends in an error in state: 496.
+## Ends in an error in state: 499.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1766,7 +1766,7 @@ interactive_expr: Match True With WILD ARROW Fun WILD ARROW With
 
 interactive_expr: Match True With WILD ARROW Fun With
 ##
-## Ends in an error in state: 494.
+## Ends in an error in state: 497.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -1778,7 +1778,7 @@ interactive_expr: Match True With WILD ARROW Fun With
 
 interactive_expr: Match True With WILD ARROW If True Then Fun WILD ARROW With
 ##
-## Ends in an error in state: 357.
+## Ends in an error in state: 360.
 ##
 ## fun_expr(base_cond) -> Fun nseq(irrefutable) ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(closed_if) -> Fun nseq(irrefutable) ARROW . closed_if [ Else ]
@@ -1791,7 +1791,7 @@ interactive_expr: Match True With WILD ARROW If True Then Fun WILD ARROW With
 
 interactive_expr: Match True With WILD ARROW If True Then Fun With
 ##
-## Ends in an error in state: 355.
+## Ends in an error in state: 358.
 ##
 ## fun_expr(base_cond) -> Fun . nseq(irrefutable) ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## fun_expr(closed_if) -> Fun . nseq(irrefutable) ARROW closed_if [ Else ]
@@ -1804,7 +1804,7 @@ interactive_expr: Match True With WILD ARROW If True Then Fun With
 
 interactive_expr: Match True With WILD ARROW If True Then If True Then True Else With
 ##
-## Ends in an error in state: 376.
+## Ends in an error in state: 379.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(closed_if) -> If expr Then closed_if Else . closed_if [ Else ]
@@ -1817,7 +1817,7 @@ interactive_expr: Match True With WILD ARROW If True Then If True Then True Else
 
 interactive_expr: Match True With WILD ARROW If True Then If True Then With
 ##
-## Ends in an error in state: 354.
+## Ends in an error in state: 357.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1831,7 +1831,7 @@ interactive_expr: Match True With WILD ARROW If True Then If True Then With
 
 interactive_expr: Match True With WILD ARROW If True Then If True With
 ##
-## Ends in an error in state: 353.
+## Ends in an error in state: 356.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1844,25 +1844,25 @@ interactive_expr: Match True With WILD ARROW If True Then If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then If With
 ##
-## Ends in an error in state: 352.
+## Ends in an error in state: 355.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -1876,7 +1876,7 @@ interactive_expr: Match True With WILD ARROW If True Then If With
 
 interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 350.
+## Ends in an error in state: 353.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let Rec let_binding seq(Attr) . In closed_if [ Else ]
@@ -1888,15 +1888,15 @@ interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes In With
 ##
-## Ends in an error in state: 351.
+## Ends in an error in state: 354.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let Rec let_binding seq(Attr) In . closed_if [ Else ]
@@ -1909,7 +1909,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes
 
 interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes With
 ##
-## Ends in an error in state: 349.
+## Ends in an error in state: 352.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let Rec let_binding . seq(Attr) In closed_if [ Else ]
@@ -1921,26 +1921,26 @@ interactive_expr: Match True With WILD ARROW If True Then Let Rec WILD EQ Bytes
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let Rec With
 ##
-## Ends in an error in state: 348.
+## Ends in an error in state: 351.
 ##
 ## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let Rec . let_binding seq(Attr) In closed_if [ Else ]
@@ -1953,7 +1953,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let Rec With
 
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 390.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding seq(Attr) . In closed_if [ Else ]
@@ -1965,15 +1965,15 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes Attr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 388.
+## Ends in an error in state: 391.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding seq(Attr) In . closed_if [ Else ]
@@ -1986,7 +1986,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes In W
 
 interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 386.
+## Ends in an error in state: 389.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(closed_if) -> Let let_binding . seq(Attr) In closed_if [ Else ]
@@ -1998,26 +1998,26 @@ interactive_expr: Match True With WILD ARROW If True Then Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Let With
 ##
-## Ends in an error in state: 347.
+## Ends in an error in state: 350.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2032,7 +2032,7 @@ interactive_expr: Match True With WILD ARROW If True Then Let With
 
 interactive_expr: Match True With WILD ARROW If True Then Match True Type
 ##
-## Ends in an error in state: 336.
+## Ends in an error in state: 339.
 ##
 ## match_expr(base_if_then_else) -> Match expr . With option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -2043,25 +2043,25 @@ interactive_expr: Match True With WILD ARROW If True Then Match True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With VBAR Begin
 ##
-## Ends in an error in state: 338.
+## Ends in an error in state: 341.
 ##
 ## match_expr(base_if_then_else) -> Match expr With option(VBAR) . cases(base_if_then_else) [ Else ]
 ##
@@ -2073,7 +2073,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With VBAR B
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With WILD ARROW Bytes With
 ##
-## Ends in an error in state: 341.
+## Ends in an error in state: 344.
 ##
 ## cases(base_cond) -> cases(base_cond) . VBAR case_clause(base_cond) [ VBAR ]
 ## cases(base_if_then_else) -> cases(base_cond) . VBAR case_clause(base_if_then_else) [ Else ]
@@ -2085,27 +2085,27 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With WILD A
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 400, spurious reduction of production base_expr(base_cond) -> disj_expr_level 
-## In state 372, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 373, spurious reduction of production base_cond -> base_cond__open(base_cond) 
-## In state 411, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
-## In state 346, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 403, spurious reduction of production base_expr(base_cond) -> disj_expr_level 
+## In state 375, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 376, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 414, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
+## In state 349, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If True Then Match True With With
 ##
-## Ends in an error in state: 337.
+## Ends in an error in state: 340.
 ##
 ## match_expr(base_if_then_else) -> Match expr With . option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -2117,7 +2117,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match True With With
 
 interactive_expr: Match True With WILD ARROW If True Then Match With
 ##
-## Ends in an error in state: 335.
+## Ends in an error in state: 338.
 ##
 ## match_expr(base_if_then_else) -> Match . expr With option(VBAR) cases(base_if_then_else) [ Else ]
 ##
@@ -2129,7 +2129,7 @@ interactive_expr: Match True With WILD ARROW If True Then Match With
 
 interactive_expr: Match True With WILD ARROW If True Then True Else With
 ##
-## Ends in an error in state: 493.
+## Ends in an error in state: 496.
 ##
 ## if_then_else(base_cond) -> If expr Then closed_if Else . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2141,7 +2141,7 @@ interactive_expr: Match True With WILD ARROW If True Then True Else With
 
 interactive_expr: Match True With WILD ARROW If True Then With
 ##
-## Ends in an error in state: 491.
+## Ends in an error in state: 494.
 ##
 ## if_then(base_cond) -> If expr Then . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr Then . closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2154,7 +2154,7 @@ interactive_expr: Match True With WILD ARROW If True Then With
 
 interactive_expr: Match True With WILD ARROW If True With
 ##
-## Ends in an error in state: 490.
+## Ends in an error in state: 493.
 ##
 ## if_then(base_cond) -> If expr . Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If expr . Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2166,25 +2166,25 @@ interactive_expr: Match True With WILD ARROW If True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW If With
 ##
-## Ends in an error in state: 489.
+## Ends in an error in state: 492.
 ##
 ## if_then(base_cond) -> If . expr Then base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## if_then_else(base_cond) -> If . expr Then closed_if Else base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2197,7 +2197,7 @@ interactive_expr: Match True With WILD ARROW If With
 
 interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 487.
+## Ends in an error in state: 490.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2208,15 +2208,15 @@ interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes In With
 ##
-## Ends in an error in state: 488.
+## Ends in an error in state: 491.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2228,7 +2228,7 @@ interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes In With
 
 interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes With
 ##
-## Ends in an error in state: 486.
+## Ends in an error in state: 489.
 ##
 ## let_expr(base_cond) -> Let Rec let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2239,26 +2239,26 @@ interactive_expr: Match True With WILD ARROW Let Rec WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let Rec With
 ##
-## Ends in an error in state: 485.
+## Ends in an error in state: 488.
 ##
 ## let_expr(base_cond) -> Let Rec . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2270,7 +2270,7 @@ interactive_expr: Match True With WILD ARROW Let Rec With
 
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes Attr Type
 ##
-## Ends in an error in state: 500.
+## Ends in an error in state: 503.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) . In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2281,15 +2281,15 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes Attr Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 170, spurious reduction of production seq(Attr) -> 
-## In state 171, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
+## In state 171, spurious reduction of production seq(Attr) -> 
+## In state 172, spurious reduction of production seq(Attr) -> Attr seq(Attr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes In With
 ##
-## Ends in an error in state: 501.
+## Ends in an error in state: 504.
 ##
 ## let_expr(base_cond) -> Let let_binding seq(Attr) In . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2301,7 +2301,7 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes In With
 
 interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 499.
+## Ends in an error in state: 502.
 ##
 ## let_expr(base_cond) -> Let let_binding . seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2312,26 +2312,26 @@ interactive_expr: Match True With WILD ARROW Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW Let With
 ##
-## Ends in an error in state: 484.
+## Ends in an error in state: 487.
 ##
 ## let_expr(base_cond) -> Let . let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## let_expr(base_cond) -> Let . Rec let_binding seq(Attr) In base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2344,7 +2344,7 @@ interactive_expr: Match True With WILD ARROW Let With
 
 interactive_expr: Match True With WILD ARROW True COMMA Bytes Else
 ##
-## Ends in an error in state: 502.
+## Ends in an error in state: 505.
 ##
 ## cases(base_cond) -> cases(base_cond) . VBAR case_clause(base_cond) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## match_expr(base_cond) -> Match expr With option(VBAR) cases(base_cond) . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
@@ -2356,30 +2356,30 @@ interactive_expr: Match True With WILD ARROW True COMMA Bytes Else
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 292, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
-## In state 291, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
-## In state 213, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
-## In state 497, spurious reduction of production base_expr(base_cond) -> tuple_expr 
-## In state 372, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 373, spurious reduction of production base_cond -> base_cond__open(base_cond) 
-## In state 411, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
-## In state 346, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 295, spurious reduction of production nsepseq(disj_expr_level,COMMA) -> disj_expr_level 
+## In state 294, spurious reduction of production tuple(disj_expr_level) -> disj_expr_level COMMA nsepseq(disj_expr_level,COMMA) 
+## In state 216, spurious reduction of production tuple_expr -> tuple(disj_expr_level) 
+## In state 500, spurious reduction of production base_expr(base_cond) -> tuple_expr 
+## In state 375, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 376, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 414, spurious reduction of production case_clause(base_cond) -> pattern ARROW base_cond 
+## In state 349, spurious reduction of production cases(base_cond) -> case_clause(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW True Else
 ##
-## Ends in an error in state: 498.
+## Ends in an error in state: 501.
 ##
 ## base_expr(base_cond) -> disj_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End EOF COMMA COLON BOOL_OR Attr ]
@@ -2393,22 +2393,22 @@ interactive_expr: Match True With WILD ARROW True Else
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD ARROW With
 ##
-## Ends in an error in state: 483.
+## Ends in an error in state: 486.
 ##
 ## case_clause(base_cond) -> pattern ARROW . base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2420,7 +2420,7 @@ interactive_expr: Match True With WILD ARROW With
 
 interactive_expr: Match True With WILD COMMA WILD COMMA With
 ##
-## Ends in an error in state: 322.
+## Ends in an error in state: 325.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ ARROW ]
 ##
@@ -2432,7 +2432,7 @@ interactive_expr: Match True With WILD COMMA WILD COMMA With
 
 interactive_expr: Match True With WILD COMMA WILD With
 ##
-## Ends in an error in state: 321.
+## Ends in an error in state: 324.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . [ ARROW ]
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ ARROW ]
@@ -2445,7 +2445,7 @@ interactive_expr: Match True With WILD COMMA WILD With
 
 interactive_expr: Match True With WILD COMMA With
 ##
-## Ends in an error in state: 320.
+## Ends in an error in state: 323.
 ##
 ## tuple(sub_pattern) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ ARROW ]
 ##
@@ -2457,7 +2457,7 @@ interactive_expr: Match True With WILD COMMA With
 
 interactive_expr: Match True With WILD CONS Bytes SEMI
 ##
-## Ends in an error in state: 482.
+## Ends in an error in state: 485.
 ##
 ## case_clause(base_cond) -> pattern . ARROW base_cond [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2468,15 +2468,15 @@ interactive_expr: Match True With WILD CONS Bytes SEMI
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
-## In state 319, spurious reduction of production pattern -> sub_pattern CONS tail 
+## In state 95, spurious reduction of production tail -> sub_pattern 
+## In state 322, spurious reduction of production pattern -> sub_pattern CONS tail 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Match True With WILD CONS With
 ##
-## Ends in an error in state: 318.
+## Ends in an error in state: 321.
 ##
 ## pattern -> sub_pattern CONS . tail [ ARROW ]
 ##
@@ -2488,7 +2488,7 @@ interactive_expr: Match True With WILD CONS With
 
 interactive_expr: Match True With WILD With
 ##
-## Ends in an error in state: 339.
+## Ends in an error in state: 342.
 ##
 ## pattern -> core_pattern . [ ARROW ]
 ## sub_pattern -> core_pattern . [ CONS COMMA ]
@@ -2501,7 +2501,7 @@ interactive_expr: Match True With WILD With
 
 interactive_expr: Match True With With
 ##
-## Ends in an error in state: 480.
+## Ends in an error in state: 483.
 ##
 ## match_expr(base_cond) -> Match expr With . option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2513,7 +2513,7 @@ interactive_expr: Match True With With
 
 interactive_expr: Match With
 ##
-## Ends in an error in state: 164.
+## Ends in an error in state: 165.
 ##
 ## match_expr(base_cond) -> Match . expr With option(VBAR) cases(base_cond) [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ##
@@ -2525,7 +2525,7 @@ interactive_expr: Match With
 
 interactive_expr: Not With
 ##
-## Ends in an error in state: 160.
+## Ends in an error in state: 161.
 ##
 ## unary_expr_level -> Not . call_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2537,7 +2537,7 @@ interactive_expr: Not With
 
 interactive_expr: True BOOL_AND With
 ##
-## Ends in an error in state: 267.
+## Ends in an error in state: 270.
 ##
 ## bin_op(conj_expr_level,BOOL_AND,comp_expr_level) -> conj_expr_level BOOL_AND . comp_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2549,7 +2549,7 @@ interactive_expr: True BOOL_AND With
 
 interactive_expr: True BOOL_OR With
 ##
-## Ends in an error in state: 298.
+## Ends in an error in state: 301.
 ##
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level BOOL_OR . conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR Attr ]
 ##
@@ -2561,7 +2561,7 @@ interactive_expr: True BOOL_OR With
 
 interactive_expr: True CAT With
 ##
-## Ends in an error in state: 250.
+## Ends in an error in state: 253.
 ##
 ## bin_op(cons_expr_level,CAT,cat_expr_level) -> cons_expr_level CAT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2573,7 +2573,7 @@ interactive_expr: True CAT With
 
 interactive_expr: True COMMA True COMMA With
 ##
-## Ends in an error in state: 293.
+## Ends in an error in state: 296.
 ##
 ## nsepseq(disj_expr_level,COMMA) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End Else EOF COLON Attr ]
 ##
@@ -2585,7 +2585,7 @@ interactive_expr: True COMMA True COMMA With
 
 interactive_expr: True COMMA With
 ##
-## Ends in an error in state: 290.
+## Ends in an error in state: 293.
 ##
 ## tuple(disj_expr_level) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Let In End Else EOF COLON Attr ]
 ##
@@ -2597,7 +2597,7 @@ interactive_expr: True COMMA With
 
 interactive_expr: True CONS With
 ##
-## Ends in an error in state: 264.
+## Ends in an error in state: 267.
 ##
 ## bin_op(add_expr_level,CONS,cons_expr_level) -> add_expr_level CONS . cons_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2609,9 +2609,9 @@ interactive_expr: True CONS With
 
 interactive_expr: True Constr With
 ##
-## Ends in an error in state: 196.
+## Ends in an error in state: 199.
 ##
-## module_field -> Constr . DOT Ident [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
+## module_field -> Constr . DOT module_fun [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type True Then TIMES String SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Nat NE Mutez Mod MINUS Let LT LPAR LE LBRACKET LBRACE Int In Ident GT GE False End Else EQ EOF Constr CONS COMMA COLON CAT Bytes Begin BOOL_OR BOOL_AND Attr ]
 ##
 ## The known suffix of the stack is as follows:
@@ -2622,7 +2622,7 @@ interactive_expr: True Constr With
 
 interactive_expr: True EQ With
 ##
-## Ends in an error in state: 279.
+## Ends in an error in state: 282.
 ##
 ## bin_op(comp_expr_level,EQ,cat_expr_level) -> comp_expr_level EQ . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2634,7 +2634,7 @@ interactive_expr: True EQ With
 
 interactive_expr: True GE With
 ##
-## Ends in an error in state: 277.
+## Ends in an error in state: 280.
 ##
 ## bin_op(comp_expr_level,GE,cat_expr_level) -> comp_expr_level GE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2646,7 +2646,7 @@ interactive_expr: True GE With
 
 interactive_expr: True GT With
 ##
-## Ends in an error in state: 275.
+## Ends in an error in state: 278.
 ##
 ## bin_op(comp_expr_level,GT,cat_expr_level) -> comp_expr_level GT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2658,7 +2658,7 @@ interactive_expr: True GT With
 
 interactive_expr: True LE With
 ##
-## Ends in an error in state: 273.
+## Ends in an error in state: 276.
 ##
 ## bin_op(comp_expr_level,LE,cat_expr_level) -> comp_expr_level LE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2670,7 +2670,7 @@ interactive_expr: True LE With
 
 interactive_expr: True LT With
 ##
-## Ends in an error in state: 271.
+## Ends in an error in state: 274.
 ##
 ## bin_op(comp_expr_level,LT,cat_expr_level) -> comp_expr_level LT . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2682,7 +2682,7 @@ interactive_expr: True LT With
 
 interactive_expr: True MINUS C_None WILD
 ##
-## Ends in an error in state: 263.
+## Ends in an error in state: 266.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2697,7 +2697,7 @@ interactive_expr: True MINUS C_None WILD
 
 interactive_expr: True MINUS With
 ##
-## Ends in an error in state: 262.
+## Ends in an error in state: 265.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS . mult_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2709,7 +2709,7 @@ interactive_expr: True MINUS With
 
 interactive_expr: True Mod With
 ##
-## Ends in an error in state: 233.
+## Ends in an error in state: 236.
 ##
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level Mod . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2721,7 +2721,7 @@ interactive_expr: True Mod With
 
 interactive_expr: True NE With
 ##
-## Ends in an error in state: 269.
+## Ends in an error in state: 272.
 ##
 ## bin_op(comp_expr_level,NE,cat_expr_level) -> comp_expr_level NE . cat_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or NE Let LT LE In GT GE End Else EQ EOF COMMA COLON BOOL_OR BOOL_AND Attr ]
 ##
@@ -2733,7 +2733,7 @@ interactive_expr: True NE With
 
 interactive_expr: True Or With
 ##
-## Ends in an error in state: 248.
+## Ends in an error in state: 251.
 ##
 ## bin_op(disj_expr_level,Or,conj_expr_level) -> disj_expr_level Or . conj_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE Or Let In End Else EOF COMMA COLON BOOL_OR Attr ]
 ##
@@ -2745,7 +2745,7 @@ interactive_expr: True Or With
 
 interactive_expr: True PLUS C_None WILD
 ##
-## Ends in an error in state: 261.
+## Ends in an error in state: 264.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS mult_expr_level . [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2760,7 +2760,7 @@ interactive_expr: True PLUS C_None WILD
 
 interactive_expr: True PLUS With
 ##
-## Ends in an error in state: 260.
+## Ends in an error in state: 263.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS . mult_expr_level [ With VBAR Type Then SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2772,7 +2772,7 @@ interactive_expr: True PLUS With
 
 interactive_expr: True SLASH With
 ##
-## Ends in an error in state: 231.
+## Ends in an error in state: 234.
 ##
 ## bin_op(mult_expr_level,SLASH,unary_expr_level) -> mult_expr_level SLASH . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2784,7 +2784,7 @@ interactive_expr: True SLASH With
 
 interactive_expr: True TIMES With
 ##
-## Ends in an error in state: 220.
+## Ends in an error in state: 223.
 ##
 ## bin_op(mult_expr_level,TIMES,unary_expr_level) -> mult_expr_level TIMES . unary_expr_level [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2796,7 +2796,7 @@ interactive_expr: True TIMES With
 
 interactive_expr: True True True WILD
 ##
-## Ends in an error in state: 226.
+## Ends in an error in state: 229.
 ##
 ## seq(core_expr) -> core_expr . seq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2808,7 +2808,7 @@ interactive_expr: True True True WILD
 
 interactive_expr: True True WILD
 ##
-## Ends in an error in state: 224.
+## Ends in an error in state: 227.
 ##
 ## nseq(core_expr) -> core_expr . seq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ##
@@ -2820,7 +2820,7 @@ interactive_expr: True True WILD
 
 interactive_expr: True VBAR
 ##
-## Ends in an error in state: 247.
+## Ends in an error in state: 250.
 ##
 ## base_expr(expr) -> disj_expr_level . [ With Type Then SEMI RPAR RBRACKET RBRACE Let In End EOF COLON Attr ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ With Type Then SEMI RPAR RBRACKET RBRACE Or Let In End EOF COMMA COLON BOOL_OR Attr ]
@@ -2834,22 +2834,22 @@ interactive_expr: True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True WILD
 ##
-## Ends in an error in state: 222.
+## Ends in an error in state: 225.
 ##
 ## call_expr -> core_expr . nseq(core_expr) [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
 ## call_expr_level -> core_expr . [ With VBAR Type Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE In GT GE End Else EQ EOF CONS COMMA COLON CAT BOOL_OR BOOL_AND Attr ]
@@ -2862,7 +2862,7 @@ interactive_expr: True WILD
 
 interactive_expr: True With
 ##
-## Ends in an error in state: 522.
+## Ends in an error in state: 527.
 ##
 ## interactive_expr -> expr . EOF [ # ]
 ##
@@ -2873,25 +2873,25 @@ interactive_expr: True With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: With
 ##
-## Ends in an error in state: 520.
+## Ends in an error in state: 525.
 ##
 ## interactive_expr' -> . interactive_expr [ # ]
 ##
@@ -2903,7 +2903,7 @@ interactive_expr: With
 
 contract: Let Ident WILD COLON Ident VBAR
 ##
-## Ends in an error in state: 156.
+## Ends in an error in state: 157.
 ##
 ## let_binding -> Ident nseq(sub_irrefutable) option(type_annotation) . EQ expr [ Type Let In EOF Attr ]
 ##
@@ -2917,15 +2917,15 @@ contract: Let Ident WILD COLON Ident VBAR
 ## In state 27, spurious reduction of production cartesian -> core_type 
 ## In state 35, spurious reduction of production fun_type -> cartesian 
 ## In state 26, spurious reduction of production type_expr -> fun_type 
-## In state 154, spurious reduction of production type_annotation -> COLON type_expr 
-## In state 155, spurious reduction of production option(type_annotation) -> type_annotation 
+## In state 155, spurious reduction of production type_annotation -> COLON type_expr 
+## In state 156, spurious reduction of production option(type_annotation) -> type_annotation 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let Ident WILD EQ With
 ##
-## Ends in an error in state: 157.
+## Ends in an error in state: 158.
 ##
 ## let_binding -> Ident nseq(sub_irrefutable) option(type_annotation) EQ . expr [ Type Let In EOF Attr ]
 ##
@@ -2937,7 +2937,7 @@ contract: Let Ident WILD EQ With
 
 contract: Let Ident WILD WILD With
 ##
-## Ends in an error in state: 149.
+## Ends in an error in state: 150.
 ##
 ## seq(sub_irrefutable) -> sub_irrefutable . seq(sub_irrefutable) [ EQ COLON ]
 ##
@@ -2949,7 +2949,7 @@ contract: Let Ident WILD WILD With
 
 contract: Let Ident WILD With
 ##
-## Ends in an error in state: 148.
+## Ends in an error in state: 149.
 ##
 ## nseq(sub_irrefutable) -> sub_irrefutable . seq(sub_irrefutable) [ EQ COLON ]
 ##
@@ -2961,7 +2961,7 @@ contract: Let Ident WILD With
 
 contract: Let Ident With
 ##
-## Ends in an error in state: 147.
+## Ends in an error in state: 148.
 ##
 ## let_binding -> Ident . nseq(sub_irrefutable) option(type_annotation) EQ expr [ Type Let In EOF Attr ]
 ## sub_irrefutable -> Ident . [ EQ COMMA COLON ]
@@ -2974,7 +2974,7 @@ contract: Let Ident With
 
 contract: Let LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 125.
+## Ends in an error in state: 126.
 ##
 ## nsepseq(field_pattern,SEMI) -> field_pattern SEMI . nsepseq(field_pattern,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(field_pattern,SEMI)) -> field_pattern SEMI . seq(__anonymous_0(field_pattern,SEMI)) [ RBRACE ]
@@ -2987,7 +2987,7 @@ contract: Let LBRACE Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 contract: Let LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 ##
-## Ends in an error in state: 124.
+## Ends in an error in state: 125.
 ##
 ## nsepseq(field_pattern,SEMI) -> field_pattern . [ RBRACE ]
 ## nsepseq(field_pattern,SEMI) -> field_pattern . SEMI nsepseq(field_pattern,SEMI) [ RBRACE ]
@@ -3001,7 +3001,7 @@ contract: Let LBRACE Ident EQ Bytes SEMI Ident EQ Bytes With
 
 contract: Let LBRACE Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 121.
+## Ends in an error in state: 122.
 ##
 ## nsepseq(field_pattern,SEMI) -> field_pattern SEMI . nsepseq(field_pattern,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(field_pattern,SEMI)) -> field_pattern SEMI . seq(__anonymous_0(field_pattern,SEMI)) [ RBRACE ]
@@ -3014,7 +3014,7 @@ contract: Let LBRACE Ident EQ Bytes SEMI With
 
 contract: Let LBRACE Ident EQ Bytes With
 ##
-## Ends in an error in state: 120.
+## Ends in an error in state: 121.
 ##
 ## nsepseq(field_pattern,SEMI) -> field_pattern . [ RBRACE ]
 ## nsepseq(field_pattern,SEMI) -> field_pattern . SEMI nsepseq(field_pattern,SEMI) [ RBRACE ]
@@ -3028,7 +3028,7 @@ contract: Let LBRACE Ident EQ Bytes With
 
 contract: Let LBRACE Ident EQ With
 ##
-## Ends in an error in state: 67.
+## Ends in an error in state: 68.
 ##
 ## field_pattern -> Ident EQ . sub_pattern [ SEMI RBRACE ]
 ##
@@ -3040,7 +3040,7 @@ contract: Let LBRACE Ident EQ With
 
 contract: Let LBRACE Ident With
 ##
-## Ends in an error in state: 66.
+## Ends in an error in state: 67.
 ##
 ## field_pattern -> Ident . EQ sub_pattern [ SEMI RBRACE ]
 ##
@@ -3052,7 +3052,7 @@ contract: Let LBRACE Ident With
 
 contract: Let LBRACE With
 ##
-## Ends in an error in state: 65.
+## Ends in an error in state: 66.
 ##
 ## record_pattern -> LBRACE . sep_or_term_list(field_pattern,SEMI) RBRACE [ WILD SEMI RPAR RBRACKET RBRACE LPAR LBRACE Ident EQ Constr CONS COMMA COLON ARROW ]
 ##
@@ -3064,7 +3064,7 @@ contract: Let LBRACE With
 
 contract: Let LPAR Constr C_Some With
 ##
-## Ends in an error in state: 78.
+## Ends in an error in state: 79.
 ##
 ## constr_pattern -> C_Some . sub_pattern [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
 ##
@@ -3076,7 +3076,7 @@ contract: Let LPAR Constr C_Some With
 
 contract: Let LPAR Constr Constr With
 ##
-## Ends in an error in state: 77.
+## Ends in an error in state: 78.
 ##
 ## constr_pattern -> Constr . [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
 ## constr_pattern -> Constr . sub_pattern [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
@@ -3089,7 +3089,7 @@ contract: Let LPAR Constr Constr With
 
 contract: Let LPAR Constr LBRACKET WILD RPAR
 ##
-## Ends in an error in state: 90.
+## Ends in an error in state: 91.
 ##
 ## nsepseq(tail,SEMI) -> tail . [ RBRACKET ]
 ## nsepseq(tail,SEMI) -> tail . SEMI nsepseq(tail,SEMI) [ RBRACKET ]
@@ -3102,14 +3102,14 @@ contract: Let LPAR Constr LBRACKET WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
+## In state 95, spurious reduction of production tail -> sub_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr LBRACKET WILD SEMI WILD RPAR
 ##
-## Ends in an error in state: 92.
+## Ends in an error in state: 93.
 ##
 ## nsepseq(tail,SEMI) -> tail . [ RBRACKET ]
 ## nsepseq(tail,SEMI) -> tail . SEMI nsepseq(tail,SEMI) [ RBRACKET ]
@@ -3122,14 +3122,14 @@ contract: Let LPAR Constr LBRACKET WILD SEMI WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
+## In state 95, spurious reduction of production tail -> sub_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr LBRACKET WILD SEMI WILD SEMI With
 ##
-## Ends in an error in state: 93.
+## Ends in an error in state: 94.
 ##
 ## nsepseq(tail,SEMI) -> tail SEMI . nsepseq(tail,SEMI) [ RBRACKET ]
 ## seq(__anonymous_0(tail,SEMI)) -> tail SEMI . seq(__anonymous_0(tail,SEMI)) [ RBRACKET ]
@@ -3142,7 +3142,7 @@ contract: Let LPAR Constr LBRACKET WILD SEMI WILD SEMI With
 
 contract: Let LPAR Constr LBRACKET WILD SEMI With
 ##
-## Ends in an error in state: 91.
+## Ends in an error in state: 92.
 ##
 ## nsepseq(tail,SEMI) -> tail SEMI . nsepseq(tail,SEMI) [ RBRACKET ]
 ## nseq(__anonymous_0(tail,SEMI)) -> tail SEMI . seq(__anonymous_0(tail,SEMI)) [ RBRACKET ]
@@ -3155,7 +3155,7 @@ contract: Let LPAR Constr LBRACKET WILD SEMI With
 
 contract: Let LPAR Constr LBRACKET With
 ##
-## Ends in an error in state: 73.
+## Ends in an error in state: 74.
 ##
 ## list__(tail) -> LBRACKET . option(sep_or_term_list(tail,SEMI)) RBRACKET [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
 ##
@@ -3167,7 +3167,7 @@ contract: Let LPAR Constr LBRACKET With
 
 contract: Let LPAR Constr LPAR WILD COMMA WILD COMMA With
 ##
-## Ends in an error in state: 110.
+## Ends in an error in state: 111.
 ##
 ## nsepseq(tail,COMMA) -> tail COMMA . nsepseq(tail,COMMA) [ RPAR ]
 ##
@@ -3179,7 +3179,7 @@ contract: Let LPAR Constr LPAR WILD COMMA WILD COMMA With
 
 contract: Let LPAR Constr LPAR WILD COMMA WILD SEMI
 ##
-## Ends in an error in state: 109.
+## Ends in an error in state: 110.
 ##
 ## nsepseq(tail,COMMA) -> tail . [ RPAR ]
 ## nsepseq(tail,COMMA) -> tail . COMMA nsepseq(tail,COMMA) [ RPAR ]
@@ -3191,14 +3191,14 @@ contract: Let LPAR Constr LPAR WILD COMMA WILD SEMI
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
+## In state 95, spurious reduction of production tail -> sub_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr LPAR WILD COMMA With
 ##
-## Ends in an error in state: 108.
+## Ends in an error in state: 109.
 ##
 ## tuple(tail) -> tail COMMA . nsepseq(tail,COMMA) [ RPAR ]
 ##
@@ -3210,7 +3210,7 @@ contract: Let LPAR Constr LPAR WILD COMMA With
 
 contract: Let LPAR Constr LPAR WILD CONS With
 ##
-## Ends in an error in state: 95.
+## Ends in an error in state: 96.
 ##
 ## tail -> sub_pattern CONS . tail [ SEMI RPAR RBRACKET COMMA ARROW ]
 ##
@@ -3222,7 +3222,7 @@ contract: Let LPAR Constr LPAR WILD CONS With
 
 contract: Let LPAR Constr LPAR WILD SEMI
 ##
-## Ends in an error in state: 106.
+## Ends in an error in state: 107.
 ##
 ## par(tail) -> LPAR tail . RPAR [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
 ## tuple(tail) -> tail . COMMA nsepseq(tail,COMMA) [ RPAR ]
@@ -3234,14 +3234,14 @@ contract: Let LPAR Constr LPAR WILD SEMI
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 94, spurious reduction of production tail -> sub_pattern 
+## In state 95, spurious reduction of production tail -> sub_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr LPAR WILD With
 ##
-## Ends in an error in state: 94.
+## Ends in an error in state: 95.
 ##
 ## tail -> sub_pattern . [ SEMI RPAR RBRACKET COMMA ARROW ]
 ## tail -> sub_pattern . CONS tail [ SEMI RPAR RBRACKET COMMA ARROW ]
@@ -3254,7 +3254,7 @@ contract: Let LPAR Constr LPAR WILD With
 
 contract: Let LPAR Constr LPAR With
 ##
-## Ends in an error in state: 72.
+## Ends in an error in state: 73.
 ##
 ## par(ptuple) -> LPAR . ptuple RPAR [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
 ## par(tail) -> LPAR . tail RPAR [ SEMI RPAR RBRACKET RBRACE CONS COMMA ARROW ]
@@ -3268,7 +3268,7 @@ contract: Let LPAR Constr LPAR With
 
 contract: Let LPAR Constr WILD With
 ##
-## Ends in an error in state: 145.
+## Ends in an error in state: 146.
 ##
 ## par(closed_irrefutable) -> LPAR closed_irrefutable . RPAR [ WILD RPAR LPAR LBRACE Ident EQ Constr COMMA COLON ARROW ]
 ##
@@ -3280,7 +3280,7 @@ contract: Let LPAR Constr WILD With
 
 contract: Let LPAR Constr With
 ##
-## Ends in an error in state: 128.
+## Ends in an error in state: 129.
 ##
 ## closed_irrefutable -> Constr . sub_pattern [ RPAR ]
 ## sub_irrefutable -> Constr . [ RPAR COMMA COLON ]
@@ -3293,7 +3293,7 @@ contract: Let LPAR Constr With
 
 contract: Let LPAR WILD COLON With
 ##
-## Ends in an error in state: 143.
+## Ends in an error in state: 144.
 ##
 ## typed_pattern -> irrefutable COLON . type_expr [ RPAR ]
 ##
@@ -3305,7 +3305,7 @@ contract: Let LPAR WILD COLON With
 
 contract: Let LPAR WILD WILD
 ##
-## Ends in an error in state: 142.
+## Ends in an error in state: 143.
 ##
 ## closed_irrefutable -> irrefutable . [ RPAR ]
 ## typed_pattern -> irrefutable . COLON type_expr [ RPAR ]
@@ -3317,14 +3317,14 @@ contract: Let LPAR WILD WILD
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 133, spurious reduction of production irrefutable -> sub_irrefutable 
+## In state 134, spurious reduction of production irrefutable -> sub_irrefutable 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR With
 ##
-## Ends in an error in state: 63.
+## Ends in an error in state: 64.
 ##
 ## par(closed_irrefutable) -> LPAR . closed_irrefutable RPAR [ WILD RPAR LPAR LBRACE Ident EQ Constr COMMA COLON ARROW ]
 ## unit -> LPAR . RPAR [ WILD RPAR LPAR LBRACE Ident EQ Constr COMMA COLON ARROW ]
@@ -3335,9 +3335,51 @@ contract: Let LPAR With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+contract: Let Rec WILD EQ Bytes With
+##
+## Ends in an error in state: 514.
+##
+## let_declaration -> Let Rec let_binding . seq(Attr) [ Type Let EOF ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec let_binding
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Let Rec With
+##
+## Ends in an error in state: 63.
+##
+## let_declaration -> Let Rec . let_binding seq(Attr) [ Type Let EOF ]
+##
+## The known suffix of the stack is as follows:
+## Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 contract: Let WILD COLON Ident VBAR
 ##
-## Ends in an error in state: 383.
+## Ends in an error in state: 386.
 ##
 ## let_binding -> irrefutable option(type_annotation) . EQ expr [ Type Let In EOF Attr ]
 ##
@@ -3351,15 +3393,15 @@ contract: Let WILD COLON Ident VBAR
 ## In state 27, spurious reduction of production cartesian -> core_type 
 ## In state 35, spurious reduction of production fun_type -> cartesian 
 ## In state 26, spurious reduction of production type_expr -> fun_type 
-## In state 154, spurious reduction of production type_annotation -> COLON type_expr 
-## In state 155, spurious reduction of production option(type_annotation) -> type_annotation 
+## In state 155, spurious reduction of production type_annotation -> COLON type_expr 
+## In state 156, spurious reduction of production option(type_annotation) -> type_annotation 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD COLON With
 ##
-## Ends in an error in state: 153.
+## Ends in an error in state: 154.
 ##
 ## type_annotation -> COLON . type_expr [ EQ ]
 ##
@@ -3371,7 +3413,7 @@ contract: Let WILD COLON With
 
 contract: Let WILD COMMA WILD COMMA With
 ##
-## Ends in an error in state: 137.
+## Ends in an error in state: 138.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
 ##
@@ -3383,7 +3425,7 @@ contract: Let WILD COMMA WILD COMMA With
 
 contract: Let WILD COMMA WILD With
 ##
-## Ends in an error in state: 136.
+## Ends in an error in state: 137.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
@@ -3396,7 +3438,7 @@ contract: Let WILD COMMA WILD With
 
 contract: Let WILD COMMA With
 ##
-## Ends in an error in state: 134.
+## Ends in an error in state: 135.
 ##
 ## tuple(sub_irrefutable) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
 ##
@@ -3408,7 +3450,7 @@ contract: Let WILD COMMA With
 
 contract: Let WILD EQ Bytes Attr With
 ##
-## Ends in an error in state: 170.
+## Ends in an error in state: 171.
 ##
 ## seq(Attr) -> Attr . seq(Attr) [ Type Let In EOF ]
 ##
@@ -3420,7 +3462,7 @@ contract: Let WILD EQ Bytes Attr With
 
 contract: Let WILD EQ Bytes With
 ##
-## Ends in an error in state: 511.
+## Ends in an error in state: 516.
 ##
 ## let_declaration -> Let let_binding . seq(Attr) [ Type Let EOF ]
 ##
@@ -3431,26 +3473,26 @@ contract: Let WILD EQ Bytes With
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 222, spurious reduction of production call_expr_level -> core_expr 
-## In state 229, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 211, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 219, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 259, spurious reduction of production cons_expr_level -> add_expr_level 
-## In state 249, spurious reduction of production cat_expr_level -> cons_expr_level 
-## In state 281, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 288, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 295, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 247, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 301, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 302, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 385, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
+## In state 225, spurious reduction of production call_expr_level -> core_expr 
+## In state 232, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 214, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 222, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 262, spurious reduction of production cons_expr_level -> add_expr_level 
+## In state 252, spurious reduction of production cat_expr_level -> cons_expr_level 
+## In state 284, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 291, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 298, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 250, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 304, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 305, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 388, spurious reduction of production let_binding -> irrefutable option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD EQ With
 ##
-## Ends in an error in state: 384.
+## Ends in an error in state: 387.
 ##
 ## let_binding -> irrefutable option(type_annotation) EQ . expr [ Type Let In EOF Attr ]
 ##
@@ -3462,7 +3504,7 @@ contract: Let WILD EQ With
 
 contract: Let WILD WILD
 ##
-## Ends in an error in state: 382.
+## Ends in an error in state: 385.
 ##
 ## let_binding -> irrefutable . option(type_annotation) EQ expr [ Type Let In EOF Attr ]
 ##
@@ -3473,14 +3515,14 @@ contract: Let WILD WILD
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 133, spurious reduction of production irrefutable -> sub_irrefutable 
+## In state 134, spurious reduction of production irrefutable -> sub_irrefutable 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD With
 ##
-## Ends in an error in state: 133.
+## Ends in an error in state: 134.
 ##
 ## irrefutable -> sub_irrefutable . [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
 ## tuple(sub_irrefutable) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ WILD RPAR LPAR LBRACE Ident EQ Constr COLON ARROW ]
@@ -3496,6 +3538,7 @@ contract: Let With
 ## Ends in an error in state: 61.
 ##
 ## let_declaration -> Let . let_binding seq(Attr) [ Type Let EOF ]
+## let_declaration -> Let . Rec let_binding seq(Attr) [ Type Let EOF ]
 ##
 ## The known suffix of the stack is as follows:
 ## Let
@@ -3617,7 +3660,7 @@ contract: Type Ident EQ Ident TIMES With
 
 contract: Type Ident EQ Ident VBAR
 ##
-## Ends in an error in state: 517.
+## Ends in an error in state: 522.
 ##
 ## declarations -> declaration . [ EOF ]
 ## declarations -> declaration . declarations [ EOF ]
@@ -3633,7 +3676,7 @@ contract: Type Ident EQ Ident VBAR
 ## In state 35, spurious reduction of production fun_type -> cartesian 
 ## In state 26, spurious reduction of production type_expr -> fun_type 
 ## In state 60, spurious reduction of production type_decl -> Type Ident EQ type_expr 
-## In state 513, spurious reduction of production declaration -> type_decl 
+## In state 518, spurious reduction of production declaration -> type_decl 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
diff --git a/src/passes/1-parser/pascaligo/error.messages.checked-in b/src/passes/1-parser/pascaligo/error.messages.checked-in
index 51fc4f532..d71f6dcb6 100644
--- a/src/passes/1-parser/pascaligo/error.messages.checked-in
+++ b/src/passes/1-parser/pascaligo/error.messages.checked-in
@@ -1,8 +1,8 @@
 interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ##
-## Ends in an error in state: 144.
+## Ends in an error in state: 151.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET sep_or_term_list(binding,SEMI)
@@ -11,29 +11,29 @@ interactive_expr: BigMap LBRACKET Unit ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap LBRACKET With
 ##
-## Ends in an error in state: 137.
+## Ends in an error in state: 144.
 ##
-## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap LBRACKET
@@ -43,9 +43,9 @@ interactive_expr: BigMap LBRACKET With
 
 interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 250.
+## Ends in an error in state: 257.
 ##
-## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap sep_or_term_list(binding,SEMI)
@@ -54,31 +54,31 @@ interactive_expr: BigMap Unit ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: BigMap With
 ##
-## Ends in an error in state: 136.
+## Ends in an error in state: 143.
 ##
-## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(BigMap,binding) -> BigMap . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap
@@ -88,9 +88,9 @@ interactive_expr: BigMap With
 
 interactive_expr: C_Some With
 ##
-## Ends in an error in state: 132.
+## Ends in an error in state: 139.
 ##
-## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> C_Some . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## C_Some
@@ -100,7 +100,7 @@ interactive_expr: C_Some With
 
 interactive_expr: Case Unit Of C_Some LPAR WILD With
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 285.
 ##
 ## par(core_pattern) -> LPAR core_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -112,7 +112,7 @@ interactive_expr: Case Unit Of C_Some LPAR WILD With
 
 interactive_expr: Case Unit Of C_Some LPAR With
 ##
-## Ends in an error in state: 270.
+## Ends in an error in state: 277.
 ##
 ## par(core_pattern) -> LPAR . core_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -124,7 +124,7 @@ interactive_expr: Case Unit Of C_Some LPAR With
 
 interactive_expr: Case Unit Of C_Some With
 ##
-## Ends in an error in state: 269.
+## Ends in an error in state: 276.
 ##
 ## constr_pattern -> C_Some . par(core_pattern) [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -136,7 +136,7 @@ interactive_expr: Case Unit Of C_Some With
 
 interactive_expr: Case Unit Of Constr LPAR WILD With
 ##
-## Ends in an error in state: 284.
+## Ends in an error in state: 291.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . COMMA nsepseq(core_pattern,COMMA) [ RPAR ]
@@ -149,7 +149,7 @@ interactive_expr: Case Unit Of Constr LPAR WILD With
 
 interactive_expr: Case Unit Of Constr LPAR With
 ##
-## Ends in an error in state: 268.
+## Ends in an error in state: 275.
 ##
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -161,7 +161,7 @@ interactive_expr: Case Unit Of Constr LPAR With
 
 interactive_expr: Case Unit Of Constr With
 ##
-## Ends in an error in state: 267.
+## Ends in an error in state: 274.
 ##
 ## constr_pattern -> Constr . tuple_pattern [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## constr_pattern -> Constr . [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -174,9 +174,9 @@ interactive_expr: Case Unit Of Constr With
 
 interactive_expr: Case Unit Of LBRACKET VBAR Block
 ##
-## Ends in an error in state: 255.
+## Ends in an error in state: 262.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) . cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR)
@@ -186,9 +186,9 @@ interactive_expr: Case Unit Of LBRACKET VBAR Block
 
 interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ##
-## Ends in an error in state: 319.
+## Ends in an error in state: 326.
 ##
-## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET option(VBAR) cases(expr) . RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET option(VBAR) cases(expr)
@@ -197,28 +197,28 @@ interactive_expr: Case Unit Of LBRACKET WILD ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 324, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 328, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 325, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LBRACKET With
 ##
-## Ends in an error in state: 254.
+## Ends in an error in state: 261.
 ##
-## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of LBRACKET . option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of LBRACKET
@@ -228,7 +228,7 @@ interactive_expr: Case Unit Of LBRACKET With
 
 interactive_expr: Case Unit Of LPAR WILD COMMA With
 ##
-## Ends in an error in state: 285.
+## Ends in an error in state: 292.
 ##
 ## nsepseq(core_pattern,COMMA) -> core_pattern COMMA . nsepseq(core_pattern,COMMA) [ RPAR ]
 ##
@@ -240,7 +240,7 @@ interactive_expr: Case Unit Of LPAR WILD COMMA With
 
 interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ##
-## Ends in an error in state: 297.
+## Ends in an error in state: 304.
 ##
 ## par(cons_pattern) -> LPAR cons_pattern . RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -251,15 +251,15 @@ interactive_expr: Case Unit Of LPAR WILD CONS Bytes ARROW
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
-## In state 290, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
+## In state 298, spurious reduction of production pattern -> core_pattern 
+## In state 297, spurious reduction of production cons_pattern -> core_pattern CONS pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of LPAR WILD CONS With
 ##
-## Ends in an error in state: 289.
+## Ends in an error in state: 296.
 ##
 ## cons_pattern -> core_pattern CONS . pattern [ RPAR ]
 ##
@@ -271,7 +271,7 @@ interactive_expr: Case Unit Of LPAR WILD CONS With
 
 interactive_expr: Case Unit Of LPAR WILD With
 ##
-## Ends in an error in state: 288.
+## Ends in an error in state: 295.
 ##
 ## cons_pattern -> core_pattern . CONS pattern [ RPAR ]
 ## nsepseq(core_pattern,COMMA) -> core_pattern . [ RPAR ]
@@ -285,7 +285,7 @@ interactive_expr: Case Unit Of LPAR WILD With
 
 interactive_expr: Case Unit Of LPAR With
 ##
-## Ends in an error in state: 263.
+## Ends in an error in state: 270.
 ##
 ## par(cons_pattern) -> LPAR . cons_pattern RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## par(nsepseq(core_pattern,COMMA)) -> LPAR . nsepseq(core_pattern,COMMA) RPAR [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -298,7 +298,7 @@ interactive_expr: Case Unit Of LPAR With
 
 interactive_expr: Case Unit Of List LBRACKET WILD End
 ##
-## Ends in an error in state: 301.
+## Ends in an error in state: 308.
 ##
 ## injection(List,core_pattern) -> List LBRACKET sep_or_term_list(core_pattern,SEMI) . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -309,15 +309,15 @@ interactive_expr: Case Unit Of List LBRACKET WILD End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 312, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 311, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List LBRACKET With
 ##
-## Ends in an error in state: 299.
+## Ends in an error in state: 306.
 ##
 ## injection(List,core_pattern) -> List LBRACKET . sep_or_term_list(core_pattern,SEMI) RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List LBRACKET . RBRACKET [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -330,7 +330,7 @@ interactive_expr: Case Unit Of List LBRACKET With
 
 interactive_expr: Case Unit Of List WILD RBRACKET
 ##
-## Ends in an error in state: 313.
+## Ends in an error in state: 320.
 ##
 ## injection(List,core_pattern) -> List sep_or_term_list(core_pattern,SEMI) . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ##
@@ -341,15 +341,15 @@ interactive_expr: Case Unit Of List WILD RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 305, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
-## In state 304, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
+## In state 312, spurious reduction of production nsepseq(core_pattern,SEMI) -> core_pattern 
+## In state 311, spurious reduction of production sep_or_term_list(core_pattern,SEMI) -> nsepseq(core_pattern,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 ##
-## Ends in an error in state: 310.
+## Ends in an error in state: 317.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -362,7 +362,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD SEMI WILD With
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 316.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -376,7 +376,7 @@ interactive_expr: Case Unit Of List WILD SEMI WILD With
 
 interactive_expr: Case Unit Of List WILD SEMI With
 ##
-## Ends in an error in state: 306.
+## Ends in an error in state: 313.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern SEMI . nsepseq(core_pattern,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(core_pattern,SEMI)) -> core_pattern SEMI . seq(__anonymous_0(core_pattern,SEMI)) [ RBRACKET End ]
@@ -389,7 +389,7 @@ interactive_expr: Case Unit Of List WILD SEMI With
 
 interactive_expr: Case Unit Of List WILD With
 ##
-## Ends in an error in state: 305.
+## Ends in an error in state: 312.
 ##
 ## nsepseq(core_pattern,SEMI) -> core_pattern . [ RBRACKET End ]
 ## nsepseq(core_pattern,SEMI) -> core_pattern . SEMI nsepseq(core_pattern,SEMI) [ RBRACKET End ]
@@ -403,7 +403,7 @@ interactive_expr: Case Unit Of List WILD With
 
 interactive_expr: Case Unit Of List With
 ##
-## Ends in an error in state: 262.
+## Ends in an error in state: 269.
 ##
 ## injection(List,core_pattern) -> List . sep_or_term_list(core_pattern,SEMI) End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
 ## injection(List,core_pattern) -> List . End [ SEMI RPAR RBRACKET End CONS COMMA ARROW ]
@@ -418,9 +418,9 @@ interactive_expr: Case Unit Of List With
 
 interactive_expr: Case Unit Of VBAR Block
 ##
-## Ends in an error in state: 324.
+## Ends in an error in state: 331.
 ##
-## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) . cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR)
@@ -430,9 +430,9 @@ interactive_expr: Case Unit Of VBAR Block
 
 interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 325.
+## Ends in an error in state: 332.
 ##
-## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of option(VBAR) cases(expr) . End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of option(VBAR) cases(expr)
@@ -441,26 +441,26 @@ interactive_expr: Case Unit Of WILD ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
-## In state 321, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
-## In state 318, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 324, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 328, spurious reduction of production nsepseq(case_clause(expr),VBAR) -> case_clause(expr) 
+## In state 325, spurious reduction of production cases(expr) -> nsepseq(case_clause(expr),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ##
-## Ends in an error in state: 321.
+## Ends in an error in state: 328.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . [ RBRACKET End ]
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) . VBAR nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
@@ -472,24 +472,24 @@ interactive_expr: Case Unit Of WILD ARROW Bytes Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 317, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 324, spurious reduction of production case_clause(expr) -> pattern ARROW expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 ##
-## Ends in an error in state: 322.
+## Ends in an error in state: 329.
 ##
 ## nsepseq(case_clause(expr),VBAR) -> case_clause(expr) VBAR . nsepseq(case_clause(expr),VBAR) [ RBRACKET End ]
 ##
@@ -501,7 +501,7 @@ interactive_expr: Case Unit Of WILD ARROW Bytes VBAR With
 
 interactive_expr: Case Unit Of WILD ARROW With
 ##
-## Ends in an error in state: 316.
+## Ends in an error in state: 323.
 ##
 ## case_clause(expr) -> pattern ARROW . expr [ VBAR RBRACKET End ]
 ##
@@ -513,7 +513,7 @@ interactive_expr: Case Unit Of WILD ARROW With
 
 interactive_expr: Case Unit Of WILD CONS WILD CONS With
 ##
-## Ends in an error in state: 295.
+## Ends in an error in state: 302.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -525,7 +525,7 @@ interactive_expr: Case Unit Of WILD CONS WILD CONS With
 
 interactive_expr: Case Unit Of WILD CONS WILD With
 ##
-## Ends in an error in state: 294.
+## Ends in an error in state: 301.
 ##
 ## nsepseq(core_pattern,CONS) -> core_pattern . [ RPAR ARROW ]
 ## nsepseq(core_pattern,CONS) -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -538,7 +538,7 @@ interactive_expr: Case Unit Of WILD CONS WILD With
 
 interactive_expr: Case Unit Of WILD CONS With
 ##
-## Ends in an error in state: 292.
+## Ends in an error in state: 299.
 ##
 ## pattern -> core_pattern CONS . nsepseq(core_pattern,CONS) [ RPAR ARROW ]
 ##
@@ -550,7 +550,7 @@ interactive_expr: Case Unit Of WILD CONS With
 
 interactive_expr: Case Unit Of WILD RPAR
 ##
-## Ends in an error in state: 315.
+## Ends in an error in state: 322.
 ##
 ## case_clause(expr) -> pattern . ARROW expr [ VBAR RBRACKET End ]
 ##
@@ -561,14 +561,14 @@ interactive_expr: Case Unit Of WILD RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
+## In state 298, spurious reduction of production pattern -> core_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case Unit Of WILD With
 ##
-## Ends in an error in state: 291.
+## Ends in an error in state: 298.
 ##
 ## pattern -> core_pattern . [ RPAR ARROW ]
 ## pattern -> core_pattern . CONS nsepseq(core_pattern,CONS) [ RPAR ARROW ]
@@ -581,10 +581,10 @@ interactive_expr: Case Unit Of WILD With
 
 interactive_expr: Case Unit Of With
 ##
-## Ends in an error in state: 253.
+## Ends in an error in state: 260.
 ##
-## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr Of . LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr Of
@@ -594,10 +594,10 @@ interactive_expr: Case Unit Of With
 
 interactive_expr: Case Unit VBAR
 ##
-## Ends in an error in state: 252.
+## Ends in an error in state: 259.
 ##
-## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case expr . Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case expr
@@ -606,26 +606,26 @@ interactive_expr: Case Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Case With
 ##
-## Ends in an error in state: 131.
+## Ends in an error in state: 138.
 ##
-## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of option(VBAR) cases(expr) End [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## case(expr) -> Case . expr Of LBRACKET option(VBAR) cases(expr) RBRACKET [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Case
@@ -635,10 +635,10 @@ interactive_expr: Case With
 
 interactive_expr: Constr DOT And With
 ##
-## Ends in an error in state: 169.
+## Ends in an error in state: 176.
 ##
-## core_expr -> module_field . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## fun_call -> module_field . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> module_field . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call -> module_field . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## module_field
@@ -648,9 +648,9 @@ interactive_expr: Constr DOT And With
 
 interactive_expr: Constr DOT Ident DOT With
 ##
-## Ends in an error in state: 120.
+## Ends in an error in state: 127.
 ##
-## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## projection -> Constr DOT Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr DOT Ident DOT
@@ -660,10 +660,10 @@ interactive_expr: Constr DOT Ident DOT With
 
 interactive_expr: Constr DOT Ident With
 ##
-## Ends in an error in state: 119.
+## Ends in an error in state: 126.
 ##
-## module_fun -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## module_fun -> Ident . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr DOT Ident
@@ -673,10 +673,10 @@ interactive_expr: Constr DOT Ident With
 
 interactive_expr: Constr DOT With
 ##
-## Ends in an error in state: 115.
+## Ends in an error in state: 122.
 ##
-## module_field -> Constr DOT . module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## module_field -> Constr DOT . module_fun [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr DOT
@@ -686,12 +686,12 @@ interactive_expr: Constr DOT With
 
 interactive_expr: Constr With
 ##
-## Ends in an error in state: 114.
+## Ends in an error in state: 121.
 ##
-## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## module_field -> Constr . DOT module_fun [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Constr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## module_field -> Constr . DOT module_fun [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr
@@ -701,9 +701,9 @@ interactive_expr: Constr With
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 ##
-## Ends in an error in state: 112.
+## Ends in an error in state: 119.
 ##
-## fun_expr -> Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function parameters COLON type_expr Is
@@ -713,9 +713,9 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 ##
-## Ends in an error in state: 111.
+## Ends in an error in state: 118.
 ##
-## fun_expr -> Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function parameters COLON type_expr
@@ -734,9 +734,9 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON With
 ##
-## Ends in an error in state: 110.
+## Ends in an error in state: 117.
 ##
-## fun_expr -> Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function parameters COLON
@@ -746,9 +746,9 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR COLON With
 
 interactive_expr: Function LPAR Const Ident COLON Ident RPAR With
 ##
-## Ends in an error in state: 109.
+## Ends in an error in state: 116.
 ##
-## fun_expr -> Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function parameters
@@ -758,7 +758,7 @@ interactive_expr: Function LPAR Const Ident COLON Ident RPAR With
 
 interactive_expr: Function LPAR Const Ident COLON With
 ##
-## Ends in an error in state: 77.
+## Ends in an error in state: 78.
 ##
 ## param_decl -> Const Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -770,7 +770,7 @@ interactive_expr: Function LPAR Const Ident COLON With
 
 interactive_expr: Function LPAR Const Ident With
 ##
-## Ends in an error in state: 76.
+## Ends in an error in state: 77.
 ##
 ## param_decl -> Const Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -782,7 +782,7 @@ interactive_expr: Function LPAR Const Ident With
 
 interactive_expr: Function LPAR Const With
 ##
-## Ends in an error in state: 75.
+## Ends in an error in state: 76.
 ##
 ## param_decl -> Const . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -794,7 +794,7 @@ interactive_expr: Function LPAR Const With
 
 interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 ##
-## Ends in an error in state: 80.
+## Ends in an error in state: 81.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl SEMI . nsepseq(param_decl,SEMI) [ RPAR ]
 ##
@@ -806,7 +806,7 @@ interactive_expr: Function LPAR Var Ident COLON Ident SEMI With
 
 interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ##
-## Ends in an error in state: 79.
+## Ends in an error in state: 80.
 ##
 ## nsepseq(param_decl,SEMI) -> param_decl . [ RPAR ]
 ## nsepseq(param_decl,SEMI) -> param_decl . SEMI nsepseq(param_decl,SEMI) [ RPAR ]
@@ -821,15 +821,15 @@ interactive_expr: Function LPAR Var Ident COLON Ident VBAR
 ## In state 15, spurious reduction of production core_type -> Ident 
 ## In state 29, spurious reduction of production cartesian -> core_type 
 ## In state 35, spurious reduction of production fun_type -> cartesian 
-## In state 74, spurious reduction of production param_type -> fun_type 
-## In state 73, spurious reduction of production param_decl -> Var Ident COLON param_type 
+## In state 75, spurious reduction of production param_type -> fun_type 
+## In state 74, spurious reduction of production param_decl -> Var Ident COLON param_type 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Function LPAR Var Ident COLON With
 ##
-## Ends in an error in state: 72.
+## Ends in an error in state: 73.
 ##
 ## param_decl -> Var Ident COLON . param_type [ SEMI RPAR ]
 ##
@@ -841,7 +841,7 @@ interactive_expr: Function LPAR Var Ident COLON With
 
 interactive_expr: Function LPAR Var Ident With
 ##
-## Ends in an error in state: 71.
+## Ends in an error in state: 72.
 ##
 ## param_decl -> Var Ident . COLON param_type [ SEMI RPAR ]
 ##
@@ -853,7 +853,7 @@ interactive_expr: Function LPAR Var Ident With
 
 interactive_expr: Function LPAR Var With
 ##
-## Ends in an error in state: 70.
+## Ends in an error in state: 71.
 ##
 ## param_decl -> Var . Ident COLON param_type [ SEMI RPAR ]
 ##
@@ -865,7 +865,7 @@ interactive_expr: Function LPAR Var With
 
 interactive_expr: Function LPAR With
 ##
-## Ends in an error in state: 69.
+## Ends in an error in state: 70.
 ##
 ## par(nsepseq(param_decl,SEMI)) -> LPAR . nsepseq(param_decl,SEMI) RPAR [ COLON ]
 ##
@@ -877,9 +877,9 @@ interactive_expr: Function LPAR With
 
 interactive_expr: Function With
 ##
-## Ends in an error in state: 108.
+## Ends in an error in state: 115.
 ##
-## fun_expr -> Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## fun_expr -> Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function
@@ -889,9 +889,9 @@ interactive_expr: Function With
 
 interactive_expr: Ident DOT Ident ASS
 ##
-## Ends in an error in state: 147.
+## Ends in an error in state: 154.
 ##
-## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> projection . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> projection . [ With LBRACKET ]
 ##
 ## The known suffix of the stack is as follows:
@@ -901,17 +901,17 @@ interactive_expr: Ident DOT Ident ASS
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 130, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 342, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident DOT Int DOT With
 ##
-## Ends in an error in state: 124.
+## Ends in an error in state: 131.
 ##
-## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection DOT
@@ -921,10 +921,10 @@ interactive_expr: Ident DOT Int DOT With
 
 interactive_expr: Ident DOT Int While
 ##
-## Ends in an error in state: 123.
+## Ends in an error in state: 130.
 ##
-## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
-## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## nsepseq(selection,DOT) -> selection . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## selection
@@ -934,9 +934,9 @@ interactive_expr: Ident DOT Int While
 
 interactive_expr: Ident DOT With
 ##
-## Ends in an error in state: 334.
+## Ends in an error in state: 341.
 ##
-## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## projection -> Ident DOT . nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident DOT
@@ -946,9 +946,9 @@ interactive_expr: Ident DOT With
 
 interactive_expr: Ident LBRACKET Unit VBAR
 ##
-## Ends in an error in state: 234.
+## Ends in an error in state: 241.
 ##
-## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET expr . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET expr
@@ -957,25 +957,25 @@ interactive_expr: Ident LBRACKET Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LBRACKET With
 ##
-## Ends in an error in state: 233.
+## Ends in an error in state: 240.
 ##
-## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
+## brackets(expr) -> LBRACKET . expr RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LBRACKET
@@ -985,7 +985,7 @@ interactive_expr: Ident LBRACKET With
 
 interactive_expr: Ident LPAR Unit COMMA With
 ##
-## Ends in an error in state: 332.
+## Ends in an error in state: 339.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
 ##
@@ -997,7 +997,7 @@ interactive_expr: Ident LPAR Unit COMMA With
 
 interactive_expr: Ident LPAR Unit VBAR
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 338.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RPAR ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
@@ -1009,25 +1009,25 @@ interactive_expr: Ident LPAR Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident LPAR With
 ##
-## Ends in an error in state: 107.
+## Ends in an error in state: 114.
 ##
-## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(nsepseq(expr,COMMA)) -> LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -1037,12 +1037,12 @@ interactive_expr: Ident LPAR With
 
 interactive_expr: Ident While
 ##
-## Ends in an error in state: 106.
+## Ends in an error in state: 113.
 ##
-## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## core_expr -> Ident . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call -> Ident . arguments [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## path -> Ident . [ With LBRACKET ]
-## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE LBRACKET GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -1052,7 +1052,7 @@ interactive_expr: Ident While
 
 interactive_expr: Ident With Record Ident DOT With
 ##
-## Ends in an error in state: 155.
+## Ends in an error in state: 162.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ EQ ]
 ##
@@ -1064,9 +1064,9 @@ interactive_expr: Ident With Record Ident DOT With
 
 interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ##
-## Ends in an error in state: 230.
+## Ends in an error in state: 237.
 ##
-## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record sep_or_term_list(field_path_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_path_assignment,SEMI)
@@ -1075,26 +1075,26 @@ interactive_expr: Ident With Record Ident EQ Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 194, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 230, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 167, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 228.
+## Ends in an error in state: 235.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1107,7 +1107,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 227.
+## Ends in an error in state: 234.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1120,24 +1120,24 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 194, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 224.
+## Ends in an error in state: 231.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment SEMI . nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(field_path_assignment,SEMI)) -> field_path_assignment SEMI . seq(__anonymous_0(field_path_assignment,SEMI)) [ RBRACKET End ]
@@ -1150,7 +1150,7 @@ interactive_expr: Ident With Record Ident EQ Bytes SEMI With
 
 interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 223.
+## Ends in an error in state: 230.
 ##
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . [ RBRACKET End ]
 ## nsepseq(field_path_assignment,SEMI) -> field_path_assignment . SEMI nsepseq(field_path_assignment,SEMI) [ RBRACKET End ]
@@ -1163,24 +1163,24 @@ interactive_expr: Ident With Record Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 194, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record Ident EQ With
 ##
-## Ends in an error in state: 162.
+## Ends in an error in state: 169.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) EQ . expr [ SEMI RBRACKET End ]
 ##
@@ -1192,7 +1192,7 @@ interactive_expr: Ident With Record Ident EQ With
 
 interactive_expr: Ident With Record Ident With
 ##
-## Ends in an error in state: 154.
+## Ends in an error in state: 161.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ EQ ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ EQ ]
@@ -1205,9 +1205,9 @@ interactive_expr: Ident With Record Ident With
 
 interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 157.
+## Ends in an error in state: 164.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET sep_or_term_list(field_path_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_path_assignment,SEMI)
@@ -1216,28 +1216,28 @@ interactive_expr: Ident With Record LBRACKET Ident EQ Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 187, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
-## In state 223, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
-## In state 160, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 194, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) EQ expr 
+## In state 230, spurious reduction of production nsepseq(field_path_assignment,SEMI) -> field_path_assignment 
+## In state 167, spurious reduction of production sep_or_term_list(field_path_assignment,SEMI) -> nsepseq(field_path_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Ident With Record LBRACKET With
 ##
-## Ends in an error in state: 153.
+## Ends in an error in state: 160.
 ##
-## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record LBRACKET . sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -1247,10 +1247,10 @@ interactive_expr: Ident With Record LBRACKET With
 
 interactive_expr: Ident With Record With
 ##
-## Ends in an error in state: 152.
+## Ends in an error in state: 159.
 ##
-## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . sep_or_term_list(field_path_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## ne_injection(Record,field_path_assignment) -> Record . LBRACKET sep_or_term_list(field_path_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -1260,9 +1260,9 @@ interactive_expr: Ident With Record With
 
 interactive_expr: Ident With With
 ##
-## Ends in an error in state: 151.
+## Ends in an error in state: 158.
 ##
-## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## update_record -> path With . ne_injection(Record,field_path_assignment) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## path With
@@ -1272,9 +1272,9 @@ interactive_expr: Ident With With
 
 interactive_expr: If Unit Then Unit Else With
 ##
-## Ends in an error in state: 341.
+## Ends in an error in state: 348.
 ##
-## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) Else . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI) Else
@@ -1284,9 +1284,9 @@ interactive_expr: If Unit Then Unit Else With
 
 interactive_expr: If Unit Then Unit SEMI EQ
 ##
-## Ends in an error in state: 340.
+## Ends in an error in state: 347.
 ##
-## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr option(SEMI) . Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr option(SEMI)
@@ -1296,9 +1296,9 @@ interactive_expr: If Unit Then Unit SEMI EQ
 
 interactive_expr: If Unit Then Unit VBAR
 ##
-## Ends in an error in state: 339.
+## Ends in an error in state: 346.
 ##
-## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then expr . option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then expr
@@ -1307,25 +1307,25 @@ interactive_expr: If Unit Then Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If Unit Then With
 ##
-## Ends in an error in state: 338.
+## Ends in an error in state: 345.
 ##
-## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr Then . expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr Then
@@ -1335,9 +1335,9 @@ interactive_expr: If Unit Then With
 
 interactive_expr: If Unit VBAR
 ##
-## Ends in an error in state: 337.
+## Ends in an error in state: 344.
 ##
-## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If expr . Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If expr
@@ -1346,25 +1346,25 @@ interactive_expr: If Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If With
 ##
-## Ends in an error in state: 105.
+## Ends in an error in state: 112.
 ##
-## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## cond_expr -> If . expr Then expr option(SEMI) Else expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## If
@@ -1374,9 +1374,9 @@ interactive_expr: If With
 
 interactive_expr: LPAR Bytes RPAR With
 ##
-## Ends in an error in state: 164.
+## Ends in an error in state: 171.
 ##
-## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## fun_call_or_par_or_projection -> par(expr) . option(arguments) [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## par(expr)
@@ -1386,9 +1386,9 @@ interactive_expr: LPAR Bytes RPAR With
 
 interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ##
-## Ends in an error in state: 345.
+## Ends in an error in state: 352.
 ##
-## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## tuple_comp -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
 ##
 ## The known suffix of the stack is as follows:
@@ -1398,27 +1398,27 @@ interactive_expr: LPAR If Unit Then Bytes Else Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 342, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
-## In state 221, spurious reduction of production expr -> cond_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 349, spurious reduction of production cond_expr -> If expr Then expr option(SEMI) Else expr 
+## In state 228, spurious reduction of production expr -> cond_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR Unit COLON Ident VBAR
 ##
-## Ends in an error in state: 351.
+## Ends in an error in state: 358.
 ##
-## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR disj_expr COLON type_expr . RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR disj_expr COLON type_expr
@@ -1437,9 +1437,9 @@ interactive_expr: LPAR Unit COLON Ident VBAR
 
 interactive_expr: LPAR Unit COLON With
 ##
-## Ends in an error in state: 350.
+## Ends in an error in state: 357.
 ##
-## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR disj_expr COLON . type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR disj_expr COLON
@@ -1449,7 +1449,7 @@ interactive_expr: LPAR Unit COLON With
 
 interactive_expr: LPAR Unit COMMA With
 ##
-## Ends in an error in state: 347.
+## Ends in an error in state: 354.
 ##
 ## tuple_comp -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
 ##
@@ -1461,9 +1461,9 @@ interactive_expr: LPAR Unit COMMA With
 
 interactive_expr: LPAR Unit VBAR
 ##
-## Ends in an error in state: 349.
+## Ends in an error in state: 356.
 ##
-## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR disj_expr . COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ## disj_expr -> disj_expr . Or conj_expr [ RPAR Or COMMA COLON ]
 ## expr -> disj_expr . [ RPAR COMMA ]
 ##
@@ -1474,26 +1474,26 @@ interactive_expr: LPAR Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR With
 ##
-## Ends in an error in state: 103.
+## Ends in an error in state: 110.
 ##
-## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## annot_expr -> LPAR . disj_expr COLON type_expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(expr) -> LPAR . expr RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LPAR LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## par(tuple_comp) -> LPAR . tuple_comp RPAR [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -1503,9 +1503,9 @@ interactive_expr: LPAR With
 
 interactive_expr: List LBRACKET Unit End
 ##
-## Ends in an error in state: 355.
+## Ends in an error in state: 362.
 ##
-## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List LBRACKET sep_or_term_list(expr,SEMI)
@@ -1514,28 +1514,28 @@ interactive_expr: List LBRACKET Unit End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: List LBRACKET With
 ##
-## Ends in an error in state: 353.
+## Ends in an error in state: 360.
 ##
-## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List LBRACKET
@@ -1545,9 +1545,9 @@ interactive_expr: List LBRACKET With
 
 interactive_expr: List Unit RBRACKET
 ##
-## Ends in an error in state: 367.
+## Ends in an error in state: 374.
 ##
-## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List sep_or_term_list(expr,SEMI)
@@ -1556,30 +1556,30 @@ interactive_expr: List Unit RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: List With
 ##
-## Ends in an error in state: 102.
+## Ends in an error in state: 109.
 ##
-## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(List,expr) -> List . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List
@@ -1589,9 +1589,9 @@ interactive_expr: List With
 
 interactive_expr: MINUS With
 ##
-## Ends in an error in state: 101.
+## Ends in an error in state: 108.
 ##
-## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## unary_expr -> MINUS . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## MINUS
@@ -1601,9 +1601,9 @@ interactive_expr: MINUS With
 
 interactive_expr: Map LBRACKET Unit ARROW Bytes End
 ##
-## Ends in an error in state: 372.
+## Ends in an error in state: 379.
 ##
-## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map LBRACKET sep_or_term_list(binding,SEMI)
@@ -1612,29 +1612,29 @@ interactive_expr: Map LBRACKET Unit ARROW Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Map LBRACKET With
 ##
-## Ends in an error in state: 370.
+## Ends in an error in state: 377.
 ##
-## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map LBRACKET
@@ -1644,9 +1644,9 @@ interactive_expr: Map LBRACKET With
 
 interactive_expr: Map Unit ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 375.
+## Ends in an error in state: 382.
 ##
-## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map sep_or_term_list(binding,SEMI)
@@ -1655,26 +1655,26 @@ interactive_expr: Map Unit ARROW Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
 ##
-## Ends in an error in state: 247.
+## Ends in an error in state: 254.
 ##
 ## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
@@ -1687,7 +1687,7 @@ interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes SEMI With
 
 interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
 ##
-## Ends in an error in state: 246.
+## Ends in an error in state: 253.
 ##
 ## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
 ## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
@@ -1700,24 +1700,24 @@ interactive_expr: Map Unit ARROW Bytes SEMI Unit ARROW Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Map Unit ARROW Bytes SEMI With
 ##
-## Ends in an error in state: 243.
+## Ends in an error in state: 250.
 ##
 ## nsepseq(binding,SEMI) -> binding SEMI . nsepseq(binding,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(binding,SEMI)) -> binding SEMI . seq(__anonymous_0(binding,SEMI)) [ RBRACKET End ]
@@ -1730,7 +1730,7 @@ interactive_expr: Map Unit ARROW Bytes SEMI With
 
 interactive_expr: Map Unit ARROW Bytes VBAR
 ##
-## Ends in an error in state: 242.
+## Ends in an error in state: 249.
 ##
 ## nsepseq(binding,SEMI) -> binding . [ RBRACKET End ]
 ## nsepseq(binding,SEMI) -> binding . SEMI nsepseq(binding,SEMI) [ RBRACKET End ]
@@ -1743,24 +1743,24 @@ interactive_expr: Map Unit ARROW Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Map Unit ARROW With
 ##
-## Ends in an error in state: 240.
+## Ends in an error in state: 247.
 ##
 ## binding -> expr ARROW . expr [ SEMI RBRACKET End ]
 ##
@@ -1772,7 +1772,7 @@ interactive_expr: Map Unit ARROW With
 
 interactive_expr: Map Unit VBAR
 ##
-## Ends in an error in state: 239.
+## Ends in an error in state: 246.
 ##
 ## binding -> expr . ARROW expr [ SEMI RBRACKET End ]
 ##
@@ -1783,28 +1783,28 @@ interactive_expr: Map Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Map With
 ##
-## Ends in an error in state: 100.
+## Ends in an error in state: 107.
 ##
-## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Map,binding) -> Map . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map
@@ -1814,12 +1814,12 @@ interactive_expr: Map With
 
 interactive_expr: Not Bytes With
 ##
-## Ends in an error in state: 166.
+## Ends in an error in state: 173.
 ##
-## add_expr -> mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## add_expr -> mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## mult_expr
@@ -1829,9 +1829,9 @@ interactive_expr: Not Bytes With
 
 interactive_expr: Not With
 ##
-## Ends in an error in state: 96.
+## Ends in an error in state: 103.
 ##
-## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## unary_expr -> Not . core_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Not
@@ -1841,9 +1841,9 @@ interactive_expr: Not With
 
 interactive_expr: Record Ident EQ Bytes RBRACKET
 ##
-## Ends in an error in state: 390.
+## Ends in an error in state: 397.
 ##
-## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_assignment,SEMI)
@@ -1852,26 +1852,26 @@ interactive_expr: Record Ident EQ Bytes RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 390, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 389, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 388.
+## Ends in an error in state: 395.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
@@ -1884,7 +1884,7 @@ interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes SEMI With
 
 interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 394.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
@@ -1897,24 +1897,24 @@ interactive_expr: Record Ident EQ Bytes SEMI Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Record Ident EQ Bytes SEMI With
 ##
-## Ends in an error in state: 384.
+## Ends in an error in state: 391.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment SEMI . nsepseq(field_assignment,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(field_assignment,SEMI)) -> field_assignment SEMI . seq(__anonymous_0(field_assignment,SEMI)) [ RBRACKET End ]
@@ -1927,7 +1927,7 @@ interactive_expr: Record Ident EQ Bytes SEMI With
 
 interactive_expr: Record Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 383.
+## Ends in an error in state: 390.
 ##
 ## nsepseq(field_assignment,SEMI) -> field_assignment . [ RBRACKET End ]
 ## nsepseq(field_assignment,SEMI) -> field_assignment . SEMI nsepseq(field_assignment,SEMI) [ RBRACKET End ]
@@ -1940,24 +1940,24 @@ interactive_expr: Record Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Record Ident EQ With
 ##
-## Ends in an error in state: 95.
+## Ends in an error in state: 102.
 ##
 ## field_assignment -> Ident EQ . expr [ SEMI RBRACKET End ]
 ##
@@ -1969,7 +1969,7 @@ interactive_expr: Record Ident EQ With
 
 interactive_expr: Record Ident With
 ##
-## Ends in an error in state: 94.
+## Ends in an error in state: 101.
 ##
 ## field_assignment -> Ident . EQ expr [ SEMI RBRACKET End ]
 ##
@@ -1981,9 +1981,9 @@ interactive_expr: Record Ident With
 
 interactive_expr: Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 379.
+## Ends in an error in state: 386.
 ##
-## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_assignment,SEMI)
@@ -1992,28 +1992,28 @@ interactive_expr: Record LBRACKET Ident EQ Bytes End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 390, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 389, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Record LBRACKET With
 ##
-## Ends in an error in state: 93.
+## Ends in an error in state: 100.
 ##
-## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -2023,10 +2023,10 @@ interactive_expr: Record LBRACKET With
 
 interactive_expr: Record With
 ##
-## Ends in an error in state: 92.
+## Ends in an error in state: 99.
 ##
-## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## record_expr -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -2034,11 +2034,92 @@ interactive_expr: Record With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+interactive_expr: Recursive Function LPAR Const Ident COLON Ident RPAR COLON Ident Is With
+##
+## Ends in an error in state: 98.
+##
+## fun_expr -> Recursive Function parameters COLON type_expr Is . expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function parameters COLON type_expr Is
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive Function LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
+##
+## Ends in an error in state: 97.
+##
+## fun_expr -> Recursive Function parameters COLON type_expr . Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function parameters COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive Function LPAR Const Ident COLON Ident RPAR COLON With
+##
+## Ends in an error in state: 96.
+##
+## fun_expr -> Recursive Function parameters COLON . type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function parameters COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive Function LPAR Const Ident COLON Ident RPAR With
+##
+## Ends in an error in state: 95.
+##
+## fun_expr -> Recursive Function parameters . COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function parameters
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive Function With
+##
+## Ends in an error in state: 94.
+##
+## fun_expr -> Recursive Function . parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+interactive_expr: Recursive With
+##
+## Ends in an error in state: 93.
+##
+## fun_expr -> Recursive . Function parameters COLON type_expr Is expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+##
+## The known suffix of the stack is as follows:
+## Recursive
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 interactive_expr: Set LBRACKET Unit End
 ##
-## Ends in an error in state: 394.
+## Ends in an error in state: 402.
 ##
-## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set LBRACKET sep_or_term_list(expr,SEMI)
@@ -2047,28 +2128,28 @@ interactive_expr: Set LBRACKET Unit End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Set LBRACKET With
 ##
-## Ends in an error in state: 392.
+## Ends in an error in state: 400.
 ##
-## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set LBRACKET . RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set LBRACKET
@@ -2078,9 +2159,9 @@ interactive_expr: Set LBRACKET With
 
 interactive_expr: Set Unit RBRACKET
 ##
-## Ends in an error in state: 397.
+## Ends in an error in state: 405.
 ##
-## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set sep_or_term_list(expr,SEMI)
@@ -2089,25 +2170,25 @@ interactive_expr: Set Unit RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Set Unit SEMI Unit SEMI With
 ##
-## Ends in an error in state: 364.
+## Ends in an error in state: 371.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -2120,7 +2201,7 @@ interactive_expr: Set Unit SEMI Unit SEMI With
 
 interactive_expr: Set Unit SEMI Unit VBAR
 ##
-## Ends in an error in state: 363.
+## Ends in an error in state: 370.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -2133,23 +2214,23 @@ interactive_expr: Set Unit SEMI Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Set Unit SEMI With
 ##
-## Ends in an error in state: 360.
+## Ends in an error in state: 367.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET End ]
@@ -2162,7 +2243,7 @@ interactive_expr: Set Unit SEMI With
 
 interactive_expr: Set Unit VBAR
 ##
-## Ends in an error in state: 359.
+## Ends in an error in state: 366.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET End ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET End ]
@@ -2175,28 +2256,28 @@ interactive_expr: Set Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Set With
 ##
-## Ends in an error in state: 91.
+## Ends in an error in state: 92.
 ##
-## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . End [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## injection(Set,expr) -> Set . LBRACKET RBRACKET [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Contains Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set
@@ -2206,9 +2287,9 @@ interactive_expr: Set With
 
 interactive_expr: Unit And With
 ##
-## Ends in an error in state: 218.
+## Ends in an error in state: 225.
 ##
-## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## conj_expr -> conj_expr And . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## conj_expr And
@@ -2218,9 +2299,9 @@ interactive_expr: Unit And With
 
 interactive_expr: Unit CAT With
 ##
-## Ends in an error in state: 194.
+## Ends in an error in state: 201.
 ##
-## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## cat_expr -> cons_expr CAT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## cons_expr CAT
@@ -2230,10 +2311,10 @@ interactive_expr: Unit CAT With
 
 interactive_expr: Unit COLON
 ##
-## Ends in an error in state: 188.
+## Ends in an error in state: 195.
 ##
-## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
-## expr -> disj_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## disj_expr -> disj_expr . Or conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
+## expr -> disj_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Of Function From End Else EOF Const COMMA Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## disj_expr
@@ -2242,24 +2323,24 @@ interactive_expr: Unit COLON
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Unit CONS With
 ##
-## Ends in an error in state: 201.
+## Ends in an error in state: 208.
 ##
-## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
+## cons_expr -> add_expr CONS . cons_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## add_expr CONS
@@ -2269,9 +2350,9 @@ interactive_expr: Unit CONS With
 
 interactive_expr: Unit Contains With
 ##
-## Ends in an error in state: 191.
+## Ends in an error in state: 198.
 ##
-## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## set_membership -> core_expr Contains . set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_expr Contains
@@ -2281,9 +2362,9 @@ interactive_expr: Unit Contains With
 
 interactive_expr: Unit EQ With
 ##
-## Ends in an error in state: 214.
+## Ends in an error in state: 221.
 ##
-## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr EQ . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr EQ
@@ -2293,9 +2374,9 @@ interactive_expr: Unit EQ With
 
 interactive_expr: Unit GE With
 ##
-## Ends in an error in state: 212.
+## Ends in an error in state: 219.
 ##
-## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr GE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr GE
@@ -2305,9 +2386,9 @@ interactive_expr: Unit GE With
 
 interactive_expr: Unit GT With
 ##
-## Ends in an error in state: 210.
+## Ends in an error in state: 217.
 ##
-## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr GT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr GT
@@ -2317,9 +2398,9 @@ interactive_expr: Unit GT With
 
 interactive_expr: Unit LE With
 ##
-## Ends in an error in state: 208.
+## Ends in an error in state: 215.
 ##
-## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr LE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr LE
@@ -2329,9 +2410,9 @@ interactive_expr: Unit LE With
 
 interactive_expr: Unit LT With
 ##
-## Ends in an error in state: 206.
+## Ends in an error in state: 213.
 ##
-## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr LT . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr LT
@@ -2341,12 +2422,12 @@ interactive_expr: Unit LT With
 
 interactive_expr: Unit MINUS Unit With
 ##
-## Ends in an error in state: 200.
+## Ends in an error in state: 207.
 ##
-## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## add_expr -> add_expr MINUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## add_expr MINUS mult_expr
@@ -2356,9 +2437,9 @@ interactive_expr: Unit MINUS Unit With
 
 interactive_expr: Unit MINUS With
 ##
-## Ends in an error in state: 199.
+## Ends in an error in state: 206.
 ##
-## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## add_expr -> add_expr MINUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## add_expr MINUS
@@ -2368,9 +2449,9 @@ interactive_expr: Unit MINUS With
 
 interactive_expr: Unit Mod With
 ##
-## Ends in an error in state: 184.
+## Ends in an error in state: 191.
 ##
-## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr Mod . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## mult_expr Mod
@@ -2380,9 +2461,9 @@ interactive_expr: Unit Mod With
 
 interactive_expr: Unit NE With
 ##
-## Ends in an error in state: 204.
+## Ends in an error in state: 211.
 ##
-## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## comp_expr -> comp_expr NE . cat_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of NE LT LE GT GE Function From End Else EQ EOF Const COMMA COLON Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## comp_expr NE
@@ -2392,9 +2473,9 @@ interactive_expr: Unit NE With
 
 interactive_expr: Unit Or With
 ##
-## Ends in an error in state: 189.
+## Ends in an error in state: 196.
 ##
-## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
+## disj_expr -> disj_expr Or . conj_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## disj_expr Or
@@ -2404,12 +2485,12 @@ interactive_expr: Unit Or With
 
 interactive_expr: Unit PLUS Unit With
 ##
-## Ends in an error in state: 198.
+## Ends in an error in state: 205.
 ##
-## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
-## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## add_expr -> add_expr PLUS mult_expr . [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . TIMES unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . SLASH unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr . Mod unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## add_expr PLUS mult_expr
@@ -2419,9 +2500,9 @@ interactive_expr: Unit PLUS Unit With
 
 interactive_expr: Unit PLUS With
 ##
-## Ends in an error in state: 197.
+## Ends in an error in state: 204.
 ##
-## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## add_expr -> add_expr PLUS . mult_expr [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## add_expr PLUS
@@ -2431,9 +2512,9 @@ interactive_expr: Unit PLUS With
 
 interactive_expr: Unit SLASH With
 ##
-## Ends in an error in state: 182.
+## Ends in an error in state: 189.
 ##
-## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr SLASH . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## mult_expr SLASH
@@ -2443,9 +2524,9 @@ interactive_expr: Unit SLASH With
 
 interactive_expr: Unit TIMES With
 ##
-## Ends in an error in state: 167.
+## Ends in an error in state: 174.
 ##
-## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## mult_expr -> mult_expr TIMES . unary_expr [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## mult_expr TIMES
@@ -2455,7 +2536,7 @@ interactive_expr: Unit TIMES With
 
 interactive_expr: Unit VBAR
 ##
-## Ends in an error in state: 586.
+## Ends in an error in state: 604.
 ##
 ## interactive_expr -> expr . EOF [ # ]
 ##
@@ -2466,26 +2547,26 @@ interactive_expr: Unit VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Unit With
 ##
-## Ends in an error in state: 190.
+## Ends in an error in state: 197.
 ##
-## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
-## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
+## set_membership -> core_expr . Contains set_membership [ VBAR Type To Then SEMI Recursive RPAR RBRACKET RBRACE Or Of Function From End Else EOF Const COMMA COLON Block Begin Attributes And ARROW ]
+## unary_expr -> core_expr . [ VBAR Type To Then TIMES SLASH SEMI Recursive RPAR RBRACKET RBRACE PLUS Or Of NE Mod MINUS LT LE GT GE Function From End Else EQ EOF Const CONS COMMA COLON CAT Block Begin Attributes And ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_expr
@@ -2495,7 +2576,7 @@ interactive_expr: Unit With
 
 interactive_expr: With
 ##
-## Ends in an error in state: 584.
+## Ends in an error in state: 602.
 ##
 ## interactive_expr' -> . interactive_expr [ # ]
 ##
@@ -2507,9 +2588,9 @@ interactive_expr: With
 
 contract: Attributes LBRACKET String End
 ##
-## Ends in an error in state: 530.
+## Ends in an error in state: 548.
 ##
-## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes LBRACKET sep_or_term_list(String,SEMI) . RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Attributes LBRACKET sep_or_term_list(String,SEMI)
@@ -2518,17 +2599,17 @@ contract: Attributes LBRACKET String End
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+## In state 540, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 551, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Attributes LBRACKET With
 ##
-## Ends in an error in state: 529.
+## Ends in an error in state: 547.
 ##
-## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes LBRACKET . sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Attributes LBRACKET
@@ -2538,7 +2619,7 @@ contract: Attributes LBRACKET With
 
 contract: Attributes String End Attributes String End SEMI With
 ##
-## Ends in an error in state: 579.
+## Ends in an error in state: 597.
 ##
 ## seq(declaration) -> declaration . seq(declaration) [ EOF ]
 ##
@@ -2550,7 +2631,7 @@ contract: Attributes String End Attributes String End SEMI With
 
 contract: Attributes String End SEMI With
 ##
-## Ends in an error in state: 577.
+## Ends in an error in state: 595.
 ##
 ## nseq(declaration) -> declaration . seq(declaration) [ EOF ]
 ##
@@ -2562,9 +2643,9 @@ contract: Attributes String End SEMI With
 
 contract: Attributes String End With
 ##
-## Ends in an error in state: 572.
+## Ends in an error in state: 590.
 ##
-## attr_decl -> open_attr_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+## attr_decl -> open_attr_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## open_attr_decl
@@ -2574,9 +2655,9 @@ contract: Attributes String End With
 
 contract: Attributes String RBRACKET
 ##
-## Ends in an error in state: 534.
+## Ends in an error in state: 552.
 ##
-## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes sep_or_term_list(String,SEMI) . End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Attributes sep_or_term_list(String,SEMI)
@@ -2585,15 +2666,15 @@ contract: Attributes String RBRACKET
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 522, spurious reduction of production nsepseq(String,SEMI) -> String 
-## In state 533, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
+## In state 540, spurious reduction of production nsepseq(String,SEMI) -> String 
+## In state 551, spurious reduction of production sep_or_term_list(String,SEMI) -> nsepseq(String,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Attributes String SEMI String SEMI With
 ##
-## Ends in an error in state: 525.
+## Ends in an error in state: 543.
 ##
 ## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
 ## seq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
@@ -2606,7 +2687,7 @@ contract: Attributes String SEMI String SEMI With
 
 contract: Attributes String SEMI String With
 ##
-## Ends in an error in state: 524.
+## Ends in an error in state: 542.
 ##
 ## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
 ## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
@@ -2620,7 +2701,7 @@ contract: Attributes String SEMI String With
 
 contract: Attributes String SEMI With
 ##
-## Ends in an error in state: 523.
+## Ends in an error in state: 541.
 ##
 ## nsepseq(String,SEMI) -> String SEMI . nsepseq(String,SEMI) [ RBRACKET End ]
 ## nseq(__anonymous_0(String,SEMI)) -> String SEMI . seq(__anonymous_0(String,SEMI)) [ RBRACKET End ]
@@ -2633,7 +2714,7 @@ contract: Attributes String SEMI With
 
 contract: Attributes String With
 ##
-## Ends in an error in state: 522.
+## Ends in an error in state: 540.
 ##
 ## nsepseq(String,SEMI) -> String . [ RBRACKET End ]
 ## nsepseq(String,SEMI) -> String . SEMI nsepseq(String,SEMI) [ RBRACKET End ]
@@ -2647,10 +2728,10 @@ contract: Attributes String With
 
 contract: Attributes With
 ##
-## Ends in an error in state: 521.
+## Ends in an error in state: 539.
 ##
-## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes . sep_or_term_list(String,SEMI) End [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## ne_injection(Attributes,String) -> Attributes . LBRACKET sep_or_term_list(String,SEMI) RBRACKET [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Attributes
@@ -2660,9 +2741,9 @@ contract: Attributes With
 
 contract: Const Ident COLON Ident EQ Bytes VBAR
 ##
-## Ends in an error in state: 570.
+## Ends in an error in state: 588.
 ##
-## const_decl -> open_const_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+## const_decl -> open_const_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## open_const_decl
@@ -2671,27 +2752,27 @@ contract: Const Ident COLON Ident EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 478, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
-## In state 479, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 496, spurious reduction of production unqualified_decl(EQ) -> Ident COLON type_expr EQ expr 
+## In state 497, spurious reduction of production open_const_decl -> Const unqualified_decl(EQ) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Const Ident COLON Ident EQ With
 ##
-## Ends in an error in state: 477.
+## Ends in an error in state: 495.
 ##
-## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## unqualified_decl(EQ) -> Ident COLON type_expr EQ . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident COLON type_expr EQ
@@ -2701,9 +2782,9 @@ contract: Const Ident COLON Ident EQ With
 
 contract: Const Ident COLON Ident VBAR
 ##
-## Ends in an error in state: 476.
+## Ends in an error in state: 494.
 ##
-## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## unqualified_decl(EQ) -> Ident COLON type_expr . EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident COLON type_expr
@@ -2722,9 +2803,9 @@ contract: Const Ident COLON Ident VBAR
 
 contract: Const Ident COLON With
 ##
-## Ends in an error in state: 475.
+## Ends in an error in state: 493.
 ##
-## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## unqualified_decl(EQ) -> Ident COLON . type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident COLON
@@ -2734,9 +2815,9 @@ contract: Const Ident COLON With
 
 contract: Const Ident With
 ##
-## Ends in an error in state: 474.
+## Ends in an error in state: 492.
 ##
-## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## unqualified_decl(EQ) -> Ident . COLON type_expr EQ expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -2746,9 +2827,9 @@ contract: Const Ident With
 
 contract: Const With
 ##
-## Ends in an error in state: 473.
+## Ends in an error in state: 491.
 ##
-## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_const_decl -> Const . unqualified_decl(EQ) [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Const
@@ -2758,7 +2839,7 @@ contract: Const With
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET VBAR Block
 ##
-## Ends in an error in state: 484.
+## Ends in an error in state: 502.
 ##
 ## case(if_clause) -> Case expr Of LBRACKET option(VBAR) . cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2770,7 +2851,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET WILD ARROW Skip End
 ##
-## Ends in an error in state: 513.
+## Ends in an error in state: 531.
 ##
 ## case(if_clause) -> Case expr Of LBRACKET option(VBAR) cases(if_clause) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2781,15 +2862,15 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+## In state 533, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 530, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of LBRACKET With
 ##
-## Ends in an error in state: 483.
+## Ends in an error in state: 501.
 ##
 ## case(if_clause) -> Case expr Of LBRACKET . option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2801,7 +2882,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of VBAR Block
 ##
-## Ends in an error in state: 518.
+## Ends in an error in state: 536.
 ##
 ## case(if_clause) -> Case expr Of option(VBAR) . cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2813,7 +2894,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip RBRACKET
 ##
-## Ends in an error in state: 519.
+## Ends in an error in state: 537.
 ##
 ## case(if_clause) -> Case expr Of option(VBAR) cases(if_clause) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2824,15 +2905,15 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 515, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
-## In state 512, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
+## In state 533, spurious reduction of production nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) 
+## In state 530, spurious reduction of production cases(if_clause) -> nsepseq(case_clause(if_clause),VBAR) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip VBAR With
 ##
-## Ends in an error in state: 516.
+## Ends in an error in state: 534.
 ##
 ## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) VBAR . nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
 ##
@@ -2844,7 +2925,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW Skip With
 ##
-## Ends in an error in state: 515.
+## Ends in an error in state: 533.
 ##
 ## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . [ RBRACKET End ]
 ## nsepseq(case_clause(if_clause),VBAR) -> case_clause(if_clause) . VBAR nsepseq(case_clause(if_clause),VBAR) [ RBRACKET End ]
@@ -2857,7 +2938,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD ARROW With
 ##
-## Ends in an error in state: 486.
+## Ends in an error in state: 504.
 ##
 ## case_clause(if_clause) -> pattern ARROW . if_clause [ VBAR RBRACKET End ]
 ##
@@ -2869,7 +2950,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of WILD RPAR
 ##
-## Ends in an error in state: 485.
+## Ends in an error in state: 503.
 ##
 ## case_clause(if_clause) -> pattern . ARROW if_clause [ VBAR RBRACKET End ]
 ##
@@ -2880,14 +2961,14 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 291, spurious reduction of production pattern -> core_pattern 
+## In state 298, spurious reduction of production pattern -> core_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit Of With
 ##
-## Ends in an error in state: 482.
+## Ends in an error in state: 500.
 ##
 ## case(if_clause) -> Case expr Of . option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## case(if_clause) -> Case expr Of . LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -2900,7 +2981,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case Unit VBAR
 ##
-## Ends in an error in state: 481.
+## Ends in an error in state: 499.
 ##
 ## case(if_clause) -> Case expr . Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## case(if_clause) -> Case expr . Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -2912,23 +2993,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Case With
 ##
-## Ends in an error in state: 480.
+## Ends in an error in state: 498.
 ##
 ## case(if_clause) -> Case . expr Of option(VBAR) cases(if_clause) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## case(if_clause) -> Case . expr Of LBRACKET option(VBAR) cases(if_clause) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -2941,7 +3022,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr DOT And With
 ##
-## Ends in an error in state: 493.
+## Ends in an error in state: 511.
 ##
 ## fun_call -> module_field . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2953,7 +3034,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Constr With
 ##
-## Ends in an error in state: 472.
+## Ends in an error in state: 490.
 ##
 ## module_field -> Constr . DOT module_fun [ LPAR ]
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ LBRACKET ASS ]
@@ -2966,7 +3047,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW Ident With
 ##
-## Ends in an error in state: 459.
+## Ends in an error in state: 477.
 ##
 ## for_loop -> For Ident option(arrow_clause) . In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -2978,7 +3059,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ARROW With
 ##
-## Ends in an error in state: 457.
+## Ends in an error in state: 475.
 ##
 ## arrow_clause -> ARROW . Ident [ In ]
 ##
@@ -2990,7 +3071,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To Unit VBAR
 ##
-## Ends in an error in state: 470.
+## Ends in an error in state: 488.
 ##
 ## for_loop -> For var_assign To expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3001,23 +3082,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes To With
 ##
-## Ends in an error in state: 469.
+## Ends in an error in state: 487.
 ##
 ## for_loop -> For var_assign To . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3029,7 +3110,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS Bytes VBAR
 ##
-## Ends in an error in state: 468.
+## Ends in an error in state: 486.
 ##
 ## for_loop -> For var_assign . To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3040,24 +3121,24 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 456, spurious reduction of production var_assign -> Ident ASS expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 474, spurious reduction of production var_assign -> Ident ASS expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident ASS With
 ##
-## Ends in an error in state: 455.
+## Ends in an error in state: 473.
 ##
 ## var_assign -> Ident ASS . expr [ To ]
 ##
@@ -3069,7 +3150,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set Unit VBAR
 ##
-## Ends in an error in state: 465.
+## Ends in an error in state: 483.
 ##
 ## for_loop -> For Ident option(arrow_clause) In collection expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3080,23 +3161,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In Set With
 ##
-## Ends in an error in state: 464.
+## Ends in an error in state: 482.
 ##
 ## for_loop -> For Ident option(arrow_clause) In collection . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3108,7 +3189,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident In With
 ##
-## Ends in an error in state: 460.
+## Ends in an error in state: 478.
 ##
 ## for_loop -> For Ident option(arrow_clause) In . collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3120,7 +3201,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For Ident With
 ##
-## Ends in an error in state: 454.
+## Ends in an error in state: 472.
 ##
 ## for_loop -> For Ident . option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## var_assign -> Ident . ASS expr [ To ]
@@ -3133,7 +3214,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin For With
 ##
-## Ends in an error in state: 453.
+## Ends in an error in state: 471.
 ##
 ## for_loop -> For . var_assign To expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## for_loop -> For . Ident option(arrow_clause) In collection expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3146,7 +3227,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident ASS With
 ##
-## Ends in an error in state: 499.
+## Ends in an error in state: 517.
 ##
 ## assignment -> lhs ASS . rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3158,7 +3239,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident DOT Ident With
 ##
-## Ends in an error in state: 492.
+## Ends in an error in state: 510.
 ##
 ## lhs -> path . [ ASS ]
 ## map_lookup -> path . brackets(expr) [ ASS ]
@@ -3170,16 +3251,16 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 123, spurious reduction of production nsepseq(selection,DOT) -> selection 
-## In state 335, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
-## In state 420, spurious reduction of production path -> projection 
+## In state 130, spurious reduction of production nsepseq(selection,DOT) -> selection 
+## In state 342, spurious reduction of production projection -> Ident DOT nsepseq(selection,DOT) 
+## In state 428, spurious reduction of production path -> projection 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident LBRACKET Bytes RBRACKET With
 ##
-## Ends in an error in state: 498.
+## Ends in an error in state: 516.
 ##
 ## assignment -> lhs . ASS rhs [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3191,7 +3272,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Ident With
 ##
-## Ends in an error in state: 452.
+## Ends in an error in state: 460.
 ##
 ## fun_call -> Ident . arguments [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## path -> Ident . [ LBRACKET ASS ]
@@ -3205,7 +3286,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE Skip End
 ##
-## Ends in an error in state: 550.
+## Ends in an error in state: 568.
 ##
 ## clause_block -> LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3216,15 +3297,15 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+## In state 554, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 571, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then LBRACE With
 ##
-## Ends in an error in state: 451.
+## Ends in an error in state: 459.
 ##
 ## clause_block -> LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3236,7 +3317,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip Else With
 ##
-## Ends in an error in state: 556.
+## Ends in an error in state: 574.
 ##
 ## conditional -> If expr Then if_clause option(SEMI) Else . if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3248,7 +3329,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip SEMI EQ
 ##
-## Ends in an error in state: 555.
+## Ends in an error in state: 573.
 ##
 ## conditional -> If expr Then if_clause option(SEMI) . Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3260,7 +3341,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then Skip With
 ##
-## Ends in an error in state: 554.
+## Ends in an error in state: 572.
 ##
 ## conditional -> If expr Then if_clause . option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3272,7 +3353,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit Then With
 ##
-## Ends in an error in state: 450.
+## Ends in an error in state: 458.
 ##
 ## conditional -> If expr Then . if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3284,7 +3365,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If Unit VBAR
 ##
-## Ends in an error in state: 449.
+## Ends in an error in state: 457.
 ##
 ## conditional -> If expr . Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3295,23 +3376,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin If With
 ##
-## Ends in an error in state: 448.
+## Ends in an error in state: 456.
 ##
 ## conditional -> If . expr Then if_clause option(SEMI) Else if_clause [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3323,7 +3404,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT Ident With
 ##
-## Ends in an error in state: 419.
+## Ends in an error in state: 427.
 ##
 ## projection -> Constr DOT Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3335,7 +3416,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr DOT With
 ##
-## Ends in an error in state: 418.
+## Ends in an error in state: 426.
 ##
 ## projection -> Constr DOT . Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3347,7 +3428,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Constr With
 ##
-## Ends in an error in state: 417.
+## Ends in an error in state: 425.
 ##
 ## projection -> Constr . DOT Ident DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3359,7 +3440,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident VBAR
 ##
-## Ends in an error in state: 425.
+## Ends in an error in state: 433.
 ##
 ## map_patch -> Patch path . With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## record_patch -> Patch path . With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3372,14 +3453,14 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 416, spurious reduction of production path -> Ident 
+## In state 424, spurious reduction of production path -> Ident 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident While
 ##
-## Ends in an error in state: 416.
+## Ends in an error in state: 424.
 ##
 ## path -> Ident . [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ## projection -> Ident . DOT nsepseq(selection,DOT) [ With VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3392,7 +3473,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET Unit ARROW Bytes End
 ##
-## Ends in an error in state: 441.
+## Ends in an error in state: 449.
 ##
 ## ne_injection(Map,binding) -> Map LBRACKET sep_or_term_list(binding,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3403,26 +3484,26 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map LBRACKET With
 ##
-## Ends in an error in state: 440.
+## Ends in an error in state: 448.
 ##
 ## ne_injection(Map,binding) -> Map LBRACKET . sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3434,7 +3515,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map Unit ARROW Bytes RBRACKET
 ##
-## Ends in an error in state: 443.
+## Ends in an error in state: 451.
 ##
 ## ne_injection(Map,binding) -> Map sep_or_term_list(binding,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3445,26 +3526,26 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 241, spurious reduction of production binding -> expr ARROW expr 
-## In state 242, spurious reduction of production nsepseq(binding,SEMI) -> binding 
-## In state 238, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 248, spurious reduction of production binding -> expr ARROW expr 
+## In state 249, spurious reduction of production nsepseq(binding,SEMI) -> binding 
+## In state 245, spurious reduction of production sep_or_term_list(binding,SEMI) -> nsepseq(binding,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Map With
 ##
-## Ends in an error in state: 439.
+## Ends in an error in state: 447.
 ##
 ## ne_injection(Map,binding) -> Map . sep_or_term_list(binding,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## ne_injection(Map,binding) -> Map . LBRACKET sep_or_term_list(binding,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3477,7 +3558,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record Ident EQ Bytes RBRACKET
 ##
-## Ends in an error in state: 437.
+## Ends in an error in state: 445.
 ##
 ## ne_injection(Record,field_assignment) -> Record sep_or_term_list(field_assignment,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3488,26 +3569,26 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 390, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 389, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET Ident EQ Bytes End
 ##
-## Ends in an error in state: 435.
+## Ends in an error in state: 443.
 ##
 ## ne_injection(Record,field_assignment) -> Record LBRACKET sep_or_term_list(field_assignment,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3518,26 +3599,26 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 378, spurious reduction of production field_assignment -> Ident EQ expr 
-## In state 383, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
-## In state 382, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 385, spurious reduction of production field_assignment -> Ident EQ expr 
+## In state 390, spurious reduction of production nsepseq(field_assignment,SEMI) -> field_assignment 
+## In state 389, spurious reduction of production sep_or_term_list(field_assignment,SEMI) -> nsepseq(field_assignment,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record LBRACKET With
 ##
-## Ends in an error in state: 434.
+## Ends in an error in state: 442.
 ##
 ## ne_injection(Record,field_assignment) -> Record LBRACKET . sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3549,7 +3630,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Record With
 ##
-## Ends in an error in state: 433.
+## Ends in an error in state: 441.
 ##
 ## ne_injection(Record,field_assignment) -> Record . sep_or_term_list(field_assignment,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## ne_injection(Record,field_assignment) -> Record . LBRACKET sep_or_term_list(field_assignment,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3562,7 +3643,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET Unit End
 ##
-## Ends in an error in state: 429.
+## Ends in an error in state: 437.
 ##
 ## ne_injection(Set,expr) -> Set LBRACKET sep_or_term_list(expr,SEMI) . RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3573,25 +3654,25 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set LBRACKET With
 ##
-## Ends in an error in state: 428.
+## Ends in an error in state: 436.
 ##
 ## ne_injection(Set,expr) -> Set LBRACKET . sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3603,7 +3684,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set Unit RBRACKET
 ##
-## Ends in an error in state: 431.
+## Ends in an error in state: 439.
 ##
 ## ne_injection(Set,expr) -> Set sep_or_term_list(expr,SEMI) . End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3614,25 +3695,25 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 359, spurious reduction of production nsepseq(expr,SEMI) -> expr 
-## In state 358, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 366, spurious reduction of production nsepseq(expr,SEMI) -> expr 
+## In state 365, spurious reduction of production sep_or_term_list(expr,SEMI) -> nsepseq(expr,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With Set With
 ##
-## Ends in an error in state: 427.
+## Ends in an error in state: 435.
 ##
 ## ne_injection(Set,expr) -> Set . sep_or_term_list(expr,SEMI) End [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## ne_injection(Set,expr) -> Set . LBRACKET sep_or_term_list(expr,SEMI) RBRACKET [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3645,7 +3726,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch Ident With With
 ##
-## Ends in an error in state: 426.
+## Ends in an error in state: 434.
 ##
 ## map_patch -> Patch path With . ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## record_patch -> Patch path With . ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3659,7 +3740,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Patch With
 ##
-## Ends in an error in state: 424.
+## Ends in an error in state: 432.
 ##
 ## map_patch -> Patch . path With ne_injection(Map,binding) [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## record_patch -> Patch . path With ne_injection(Record,field_assignment) [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3673,7 +3754,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Map With
 ##
-## Ends in an error in state: 422.
+## Ends in an error in state: 430.
 ##
 ## map_remove -> Remove expr From Map . path [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3685,7 +3766,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From Set With
 ##
-## Ends in an error in state: 415.
+## Ends in an error in state: 423.
 ##
 ## set_remove -> Remove expr From Set . path [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3697,7 +3778,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit From With
 ##
-## Ends in an error in state: 414.
+## Ends in an error in state: 422.
 ##
 ## map_remove -> Remove expr From . Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## set_remove -> Remove expr From . Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3710,7 +3791,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove Unit VBAR
 ##
-## Ends in an error in state: 413.
+## Ends in an error in state: 421.
 ##
 ## map_remove -> Remove expr . From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## set_remove -> Remove expr . From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3722,23 +3803,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Remove With
 ##
-## Ends in an error in state: 412.
+## Ends in an error in state: 420.
 ##
 ## map_remove -> Remove . expr From Map path [ VBAR SEMI RBRACKET RBRACE End Else ]
 ## set_remove -> Remove . expr From Set path [ VBAR SEMI RBRACKET RBRACE End Else ]
@@ -3751,9 +3832,9 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
 ##
-## Ends in an error in state: 564.
+## Ends in an error in state: 468.
 ##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters COLON type_expr Is block
@@ -3763,9 +3844,9 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
 ##
-## Ends in an error in state: 565.
+## Ends in an error in state: 469.
 ##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters COLON type_expr Is block With
@@ -3775,7 +3856,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip RBRACE
 ##
-## Ends in an error in state: 558.
+## Ends in an error in state: 576.
 ##
 ## block -> Begin sep_or_term_list(statement,SEMI) . End [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3786,15 +3867,15 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+## In state 554, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 571, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip SEMI With
 ##
-## Ends in an error in state: 539.
+## Ends in an error in state: 557.
 ##
 ## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
 ## seq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
@@ -3807,7 +3888,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI Skip With
 ##
-## Ends in an error in state: 538.
+## Ends in an error in state: 556.
 ##
 ## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
 ## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
@@ -3821,7 +3902,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip SEMI With
 ##
-## Ends in an error in state: 537.
+## Ends in an error in state: 555.
 ##
 ## nsepseq(statement,SEMI) -> statement SEMI . nsepseq(statement,SEMI) [ RBRACE End ]
 ## nseq(__anonymous_0(statement,SEMI)) -> statement SEMI . seq(__anonymous_0(statement,SEMI)) [ RBRACE End ]
@@ -3834,7 +3915,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip With
 ##
-## Ends in an error in state: 536.
+## Ends in an error in state: 554.
 ##
 ## nsepseq(statement,SEMI) -> statement . [ RBRACE End ]
 ## nsepseq(statement,SEMI) -> statement . SEMI nsepseq(statement,SEMI) [ RBRACE End ]
@@ -3848,7 +3929,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident ASS With
 ##
-## Ends in an error in state: 408.
+## Ends in an error in state: 416.
 ##
 ## unqualified_decl(ASS) -> Ident COLON type_expr ASS . expr [ SEMI RBRACE End ]
 ##
@@ -3860,7 +3941,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON Ident VBAR
 ##
-## Ends in an error in state: 407.
+## Ends in an error in state: 415.
 ##
 ## unqualified_decl(ASS) -> Ident COLON type_expr . ASS expr [ SEMI RBRACE End ]
 ##
@@ -3881,7 +3962,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident COLON With
 ##
-## Ends in an error in state: 406.
+## Ends in an error in state: 414.
 ##
 ## unqualified_decl(ASS) -> Ident COLON . type_expr ASS expr [ SEMI RBRACE End ]
 ##
@@ -3893,7 +3974,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var Ident With
 ##
-## Ends in an error in state: 405.
+## Ends in an error in state: 413.
 ##
 ## unqualified_decl(ASS) -> Ident . COLON type_expr ASS expr [ SEMI RBRACE End ]
 ##
@@ -3905,7 +3986,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Var With
 ##
-## Ends in an error in state: 404.
+## Ends in an error in state: 412.
 ##
 ## open_var_decl -> Var . unqualified_decl(ASS) [ SEMI RBRACE End ]
 ##
@@ -3917,7 +3998,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While Unit VBAR
 ##
-## Ends in an error in state: 402.
+## Ends in an error in state: 410.
 ##
 ## while_loop -> While expr . block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3928,23 +4009,23 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin While With
 ##
-## Ends in an error in state: 401.
+## Ends in an error in state: 409.
 ##
 ## while_loop -> While . expr block [ VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3956,7 +4037,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin With
 ##
-## Ends in an error in state: 403.
+## Ends in an error in state: 411.
 ##
 ## block -> Begin . sep_or_term_list(statement,SEMI) End [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3968,7 +4049,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE Skip End
 ##
-## Ends in an error in state: 561.
+## Ends in an error in state: 579.
 ##
 ## block -> Block LBRACE sep_or_term_list(statement,SEMI) . RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3979,15 +4060,15 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 536, spurious reduction of production nsepseq(statement,SEMI) -> statement 
-## In state 553, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
+## In state 554, spurious reduction of production nsepseq(statement,SEMI) -> statement 
+## In state 571, spurious reduction of production sep_or_term_list(statement,SEMI) -> nsepseq(statement,SEMI) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block LBRACE With
 ##
-## Ends in an error in state: 400.
+## Ends in an error in state: 408.
 ##
 ## block -> Block LBRACE . sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -3999,7 +4080,7 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block With
 ##
-## Ends in an error in state: 399.
+## Ends in an error in state: 407.
 ##
 ## block -> Block . LBRACE sep_or_term_list(statement,SEMI) RBRACE [ With VBAR SEMI RBRACKET RBRACE End Else ]
 ##
@@ -4011,9 +4092,9 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Block
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes VBAR
 ##
-## Ends in an error in state: 568.
+## Ends in an error in state: 586.
 ##
-## fun_decl -> open_fun_decl . option(SEMI) [ Type Function EOF Const Attributes ]
+## fun_decl -> open_fun_decl . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## open_fun_decl
@@ -4022,27 +4103,27 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Bytes
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 190, spurious reduction of production unary_expr -> core_expr 
-## In state 140, spurious reduction of production mult_expr -> unary_expr 
-## In state 166, spurious reduction of production add_expr -> mult_expr 
-## In state 196, spurious reduction of production cons_expr -> add_expr 
-## In state 193, spurious reduction of production cat_expr -> cons_expr 
-## In state 216, spurious reduction of production comp_expr -> cat_expr 
-## In state 203, spurious reduction of production set_membership -> comp_expr 
-## In state 142, spurious reduction of production conj_expr -> set_membership 
-## In state 220, spurious reduction of production disj_expr -> conj_expr 
-## In state 188, spurious reduction of production expr -> disj_expr 
-## In state 563, spurious reduction of production open_fun_decl -> Function Ident parameters COLON type_expr Is expr 
+## In state 197, spurious reduction of production unary_expr -> core_expr 
+## In state 147, spurious reduction of production mult_expr -> unary_expr 
+## In state 173, spurious reduction of production add_expr -> mult_expr 
+## In state 203, spurious reduction of production cons_expr -> add_expr 
+## In state 200, spurious reduction of production cat_expr -> cons_expr 
+## In state 223, spurious reduction of production comp_expr -> cat_expr 
+## In state 210, spurious reduction of production set_membership -> comp_expr 
+## In state 149, spurious reduction of production conj_expr -> set_membership 
+## In state 227, spurious reduction of production disj_expr -> conj_expr 
+## In state 195, spurious reduction of production expr -> disj_expr 
+## In state 467, spurious reduction of production open_fun_decl -> Function Ident parameters COLON type_expr Is expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 ##
-## Ends in an error in state: 87.
+## Ends in an error in state: 466.
 ##
-## open_fun_decl -> Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON type_expr Is . expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr Is . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters COLON type_expr Is
@@ -4052,10 +4133,10 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 ##
-## Ends in an error in state: 86.
+## Ends in an error in state: 465.
 ##
-## open_fun_decl -> Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON type_expr . Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON type_expr . Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters COLON type_expr
@@ -4074,10 +4155,10 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
 ##
-## Ends in an error in state: 85.
+## Ends in an error in state: 464.
 ##
-## open_fun_decl -> Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters COLON . type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters COLON . type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters COLON
@@ -4087,10 +4168,10 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR COLON With
 
 contract: Function Ident LPAR Const Ident COLON Ident RPAR With
 ##
-## Ends in an error in state: 84.
+## Ends in an error in state: 463.
 ##
-## open_fun_decl -> Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident parameters . COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident parameters . COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident parameters
@@ -4100,10 +4181,10 @@ contract: Function Ident LPAR Const Ident COLON Ident RPAR With
 
 contract: Function Ident With
 ##
-## Ends in an error in state: 68.
+## Ends in an error in state: 462.
 ##
-## open_fun_decl -> Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function Ident . parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function Ident . parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function Ident
@@ -4113,10 +4194,10 @@ contract: Function Ident With
 
 contract: Function With
 ##
-## Ends in an error in state: 67.
+## Ends in an error in state: 461.
 ##
-## open_fun_decl -> Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
-## open_fun_decl -> Function . Ident parameters COLON type_expr Is expr [ Type SEMI RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Function . Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Function
@@ -4124,11 +4205,135 @@ contract: Function With
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End While
+##
+## Ends in an error in state: 582.
+##
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr Is block . With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters COLON type_expr Is block
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is Begin Skip End With With
+##
+## Ends in an error in state: 583.
+##
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr Is block With . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters COLON type_expr Is block With
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident Is With
+##
+## Ends in an error in state: 88.
+##
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr Is . block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr Is . expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters COLON type_expr Is
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR COLON Ident VBAR
+##
+## Ends in an error in state: 87.
+##
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr . Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function Ident parameters COLON type_expr . Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters COLON type_expr
+##
+## WARNING: This example involves spurious reductions.
+## This implies that, although the LR(1) items shown above provide an
+## accurate view of the past (what has been recognized so far), they
+## may provide an INCOMPLETE view of the future (what was expected next).
+## In state 15, spurious reduction of production core_type -> Ident 
+## In state 29, spurious reduction of production cartesian -> core_type 
+## In state 35, spurious reduction of production fun_type -> cartesian 
+## In state 43, spurious reduction of production type_expr -> fun_type 
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR COLON With
+##
+## Ends in an error in state: 86.
+##
+## open_fun_decl -> Recursive Function Ident parameters COLON . type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function Ident parameters COLON . type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters COLON
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident LPAR Const Ident COLON Ident RPAR With
+##
+## Ends in an error in state: 85.
+##
+## open_fun_decl -> Recursive Function Ident parameters . COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function Ident parameters . COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident parameters
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function Ident With
+##
+## Ends in an error in state: 69.
+##
+## open_fun_decl -> Recursive Function Ident . parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function Ident . parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function Ident
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive Function With
+##
+## Ends in an error in state: 68.
+##
+## open_fun_decl -> Recursive Function . Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive Function . Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive Function
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
+contract: Recursive With
+##
+## Ends in an error in state: 67.
+##
+## open_fun_decl -> Recursive . Function Ident parameters COLON type_expr Is block With expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+## open_fun_decl -> Recursive . Function Ident parameters COLON type_expr Is expr [ Type SEMI Recursive RBRACE Function End EOF Const Attributes ]
+##
+## The known suffix of the stack is as follows:
+## Recursive
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 contract: Type Ident Is BigMap With
 ##
 ## Ends in an error in state: 18.
 ##
-## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> BigMap . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## BigMap
@@ -4140,7 +4345,7 @@ contract: Type Ident Is Constr Of With
 ##
 ## Ends in an error in state: 27.
 ##
-## variant -> Constr Of . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## variant -> Constr Of . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr Of
@@ -4152,7 +4357,7 @@ contract: Type Ident Is Constr VBAR With
 ##
 ## Ends in an error in state: 39.
 ##
-## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## nsepseq(variant,VBAR) -> variant VBAR . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## variant VBAR
@@ -4164,8 +4369,8 @@ contract: Type Ident Is Constr With
 ##
 ## Ends in an error in state: 26.
 ##
-## variant -> Constr . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## variant -> Constr . Of fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## variant -> Constr . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## variant -> Constr . Of fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Constr
@@ -4177,7 +4382,7 @@ contract: Type Ident Is Ident ARROW With
 ##
 ## Ends in an error in state: 36.
 ##
-## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## fun_type -> cartesian ARROW . fun_type [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## cartesian ARROW
@@ -4189,7 +4394,7 @@ contract: Type Ident Is Ident TIMES Ident TIMES With
 ##
 ## Ends in an error in state: 33.
 ##
-## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## nsepseq(core_type,TIMES) -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type TIMES
@@ -4201,8 +4406,8 @@ contract: Type Ident Is Ident TIMES LPAR Ident RPAR With
 ##
 ## Ends in an error in state: 32.
 ##
-## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## nsepseq(core_type,TIMES) -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## nsepseq(core_type,TIMES) -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type
@@ -4214,7 +4419,7 @@ contract: Type Ident Is Ident TIMES With
 ##
 ## Ends in an error in state: 30.
 ##
-## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type TIMES . nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type TIMES
@@ -4226,7 +4431,7 @@ contract: Type Ident Is Ident VBAR
 ##
 ## Ends in an error in state: 64.
 ##
-## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type Ident Is type_expr . option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident Is type_expr
@@ -4247,8 +4452,8 @@ contract: Type Ident Is Ident With
 ##
 ## Ends in an error in state: 15.
 ##
-## core_type -> Ident . [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Ident . [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Ident . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Ident
@@ -4260,8 +4465,8 @@ contract: Type Ident Is LPAR Constr RPAR With
 ##
 ## Ends in an error in state: 29.
 ##
-## cartesian -> core_type . [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
-## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type . [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## cartesian -> core_type . TIMES nsepseq(core_type,TIMES) [ VBAR Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## core_type
@@ -4273,7 +4478,7 @@ contract: Type Ident Is LPAR Ident VBAR
 ##
 ## Ends in an error in state: 61.
 ##
-## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR type_expr . RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR type_expr
@@ -4294,7 +4499,7 @@ contract: Type Ident Is LPAR With
 ##
 ## Ends in an error in state: 6.
 ##
-## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(type_expr) -> LPAR . type_expr RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -4306,7 +4511,7 @@ contract: Type Ident Is List With
 ##
 ## Ends in an error in state: 13.
 ##
-## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> List . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## List
@@ -4352,7 +4557,7 @@ contract: Type Ident Is Map LPAR With
 ##
 ## Ends in an error in state: 12.
 ##
-## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## par(nsepseq(type_expr,COMMA)) -> LPAR . nsepseq(type_expr,COMMA) RPAR [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## LPAR
@@ -4364,7 +4569,7 @@ contract: Type Ident Is Map With
 ##
 ## Ends in an error in state: 11.
 ##
-## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Map . type_tuple [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Map
@@ -4376,7 +4581,7 @@ contract: Type Ident Is Record Ident COLON Ident RBRACKET
 ##
 ## Ends in an error in state: 59.
 ##
-## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record sep_or_term_list(field_decl,SEMI) . End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record sep_or_term_list(field_decl,SEMI)
@@ -4498,7 +4703,7 @@ contract: Type Ident Is Record LBRACKET Ident COLON Ident End
 ##
 ## Ends in an error in state: 48.
 ##
-## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET sep_or_term_list(field_decl,SEMI) . RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET sep_or_term_list(field_decl,SEMI)
@@ -4522,7 +4727,7 @@ contract: Type Ident Is Record LBRACKET With
 ##
 ## Ends in an error in state: 8.
 ##
-## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record LBRACKET . sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record LBRACKET
@@ -4534,8 +4739,8 @@ contract: Type Ident Is Record With
 ##
 ## Ends in an error in state: 7.
 ##
-## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
-## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . sep_or_term_list(field_decl,SEMI) End [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## record_type -> Record . LBRACKET sep_or_term_list(field_decl,SEMI) RBRACKET [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## Record
@@ -4547,7 +4752,7 @@ contract: Type Ident Is Set With
 ##
 ## Ends in an error in state: 5.
 ##
-## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
+## core_type -> Set . par(type_expr) [ VBAR Type TIMES SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ARROW ]
 ##
 ## The known suffix of the stack is as follows:
 ## Set
@@ -4559,7 +4764,7 @@ contract: Type Ident Is VBAR Const
 ##
 ## Ends in an error in state: 25.
 ##
-## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
+## sum_type -> option(VBAR) . nsepseq(variant,VBAR) [ Type SEMI Recursive RPAR RBRACKET Is Function End EQ EOF Const COMMA Attributes ASS ]
 ##
 ## The known suffix of the stack is as follows:
 ## option(VBAR)
@@ -4571,7 +4776,7 @@ contract: Type Ident Is With
 ##
 ## Ends in an error in state: 3.
 ##
-## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type Ident Is . type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident Is
@@ -4583,7 +4788,7 @@ contract: Type Ident With
 ##
 ## Ends in an error in state: 2.
 ##
-## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type Ident . Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type Ident
@@ -4595,7 +4800,7 @@ contract: Type With
 ##
 ## Ends in an error in state: 1.
 ##
-## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Function EOF Const Attributes ]
+## type_decl -> Type . Ident Is type_expr option(SEMI) [ Type Recursive Function EOF Const Attributes ]
 ##
 ## The known suffix of the stack is as follows:
 ## Type
diff --git a/src/passes/1-parser/reasonligo/error.messages.checked-in b/src/passes/1-parser/reasonligo/error.messages.checked-in
index 9b107c412..a00aed226 100644
--- a/src/passes/1-parser/reasonligo/error.messages.checked-in
+++ b/src/passes/1-parser/reasonligo/error.messages.checked-in
@@ -1,6 +1,6 @@
 interactive_expr: C_None WILD
 ##
-## Ends in an error in state: 170.
+## Ends in an error in state: 172.
 ##
 ## call_expr_level -> call_expr_level_in . option(type_annotation_simple) [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -12,7 +12,7 @@ interactive_expr: C_None WILD
 
 interactive_expr: C_Some WILD
 ##
-## Ends in an error in state: 122.
+## Ends in an error in state: 124.
 ##
 ## constr_expr -> C_Some . core_expr [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -24,9 +24,9 @@ interactive_expr: C_Some WILD
 
 interactive_expr: Constr DOT Ident WILD
 ##
-## Ends in an error in state: 109.
+## Ends in an error in state: 110.
 ##
-## module_field -> Constr DOT Ident . [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
+## module_fun -> Ident . [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## projection -> Constr DOT Ident . selection [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
 ## The known suffix of the stack is as follows:
@@ -39,7 +39,7 @@ interactive_expr: Constr DOT WILD
 ##
 ## Ends in an error in state: 108.
 ##
-## module_field -> Constr DOT . Ident [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
+## module_field -> Constr DOT . module_fun [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## projection -> Constr DOT . Ident selection [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
 ## The known suffix of the stack is as follows:
@@ -54,7 +54,7 @@ interactive_expr: Constr WILD
 ##
 ## constr_expr -> Constr . core_expr [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## constr_expr -> Constr . [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
-## module_field -> Constr . DOT Ident [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
+## module_field -> Constr . DOT module_fun [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## projection -> Constr . DOT Ident selection [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
 ## The known suffix of the stack is as follows:
@@ -143,7 +143,7 @@ interactive_expr: Ident WILD
 
 interactive_expr: If LBRACE True VBAR
 ##
-## Ends in an error in state: 226.
+## Ends in an error in state: 228.
 ##
 ## parenthesized_expr -> LBRACE expr . RBRACE [ LBRACE ]
 ##
@@ -154,26 +154,26 @@ interactive_expr: If LBRACE True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LBRACE WILD
 ##
-## Ends in an error in state: 225.
+## Ends in an error in state: 227.
 ##
 ## parenthesized_expr -> LBRACE . expr RBRACE [ LBRACE ]
 ##
@@ -185,7 +185,7 @@ interactive_expr: If LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 406.
+## Ends in an error in state: 408.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -196,31 +196,31 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True ARROW
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 406, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 417, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 416, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 411.
+## Ends in an error in state: 413.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if . option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -231,31 +231,31 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 406, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 417, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 416, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 412.
+## Ends in an error in state: 414.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) . RBRACE [ SEMI RBRACE ]
 ##
@@ -267,7 +267,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 410.
+## Ends in an error in state: 412.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -279,7 +279,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 409.
+## Ends in an error in state: 411.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -291,7 +291,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 408.
+## Ends in an error in state: 410.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -303,7 +303,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True RBRACE
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 407.
+## Ends in an error in state: 409.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -315,7 +315,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE True SEMI P
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE WILD
 ##
-## Ends in an error in state: 348.
+## Ends in an error in state: 350.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr LBRACE . closed_if option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -327,7 +327,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR WILD
 ##
-## Ends in an error in state: 347.
+## Ends in an error in state: 349.
 ##
 ## if_then_else(closed_if) -> If parenthesized_expr . LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -339,7 +339,7 @@ interactive_expr: If LPAR True RPAR LBRACE If LPAR Bytes RPAR WILD
 
 interactive_expr: If LPAR True RPAR LBRACE If WILD
 ##
-## Ends in an error in state: 346.
+## Ends in an error in state: 348.
 ##
 ## if_then_else(closed_if) -> If . parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE closed_if option(SEMI) RBRACE [ SEMI RBRACE ]
 ##
@@ -351,7 +351,7 @@ interactive_expr: If LPAR True RPAR LBRACE If WILD
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR VBAR
 ##
-## Ends in an error in state: 273.
+## Ends in an error in state: 275.
 ##
 ## case_clause(base_if_then_else) -> VBAR . pattern ARROW base_if_then_else option(SEMI) [ VBAR RBRACE ]
 ##
@@ -363,7 +363,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR VBAR
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 435.
+## Ends in an error in state: 437.
 ##
 ## nseq(case_clause(base_if_then_else)) -> case_clause(base_if_then_else) . seq(case_clause(base_if_then_else)) [ RBRACE ]
 ##
@@ -375,7 +375,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW By
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 437.
+## Ends in an error in state: 439.
 ##
 ## seq(case_clause(base_if_then_else)) -> case_clause(base_if_then_else) . seq(case_clause(base_if_then_else)) [ RBRACE ]
 ##
@@ -387,7 +387,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW By
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 416.
+## Ends in an error in state: 418.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -398,31 +398,31 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 406, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 417, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 416, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 426.
+## Ends in an error in state: 428.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) . RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -434,7 +434,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ##
-## Ends in an error in state: 425.
+## Ends in an error in state: 427.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else . option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -445,26 +445,26 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 423, spurious reduction of production base_expr(base_if_then_else) -> disj_expr_level 
-## In state 428, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
-## In state 424, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 425, spurious reduction of production base_expr(base_if_then_else) -> disj_expr_level 
+## In state 430, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
+## In state 426, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 420.
+## Ends in an error in state: 422.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -476,7 +476,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 419.
+## Ends in an error in state: 421.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -488,7 +488,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 418.
+## Ends in an error in state: 420.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -500,7 +500,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 417.
+## Ends in an error in state: 419.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -512,7 +512,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR LBRACE WILD
 ##
-## Ends in an error in state: 345.
+## Ends in an error in state: 347.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr LBRACE . closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -524,7 +524,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If LPAR Bytes RPAR WILD
 ##
-## Ends in an error in state: 344.
+## Ends in an error in state: 346.
 ##
 ## if_then_else(base_if_then_else) -> If parenthesized_expr . LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -536,7 +536,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If WILD
 ##
-## Ends in an error in state: 343.
+## Ends in an error in state: 345.
 ##
 ## if_then_else(base_if_then_else) -> If . parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE base_if_then_else option(SEMI) RBRACE [ VBAR SEMI RBRACE ]
 ##
@@ -548,7 +548,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW If
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ##
-## Ends in an error in state: 429.
+## Ends in an error in state: 431.
 ##
 ## case_clause(base_if_then_else) -> VBAR pattern ARROW base_if_then_else . option(SEMI) [ VBAR RBRACE ]
 ##
@@ -559,31 +559,31 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Tr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 422, spurious reduction of production base_expr(base_if_then_else) -> fun_expr 
-## In state 428, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
-## In state 424, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 424, spurious reduction of production base_expr(base_if_then_else) -> fun_expr 
+## In state 430, spurious reduction of production base_if_then_else__open(base_if_then_else) -> base_expr(base_if_then_else) 
+## In state 426, spurious reduction of production base_if_then_else -> base_if_then_else__open(base_if_then_else) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW True Type
 ##
-## Ends in an error in state: 423.
+## Ends in an error in state: 425.
 ##
 ## base_expr(base_if_then_else) -> disj_expr_level . [ VBAR SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ VBAR SEMI RBRACE Or BOOL_OR ARROW ]
@@ -597,23 +597,23 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW Tr
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW WILD
 ##
-## Ends in an error in state: 342.
+## Ends in an error in state: 344.
 ##
 ## case_clause(base_if_then_else) -> VBAR pattern ARROW . base_if_then_else option(SEMI) [ VBAR RBRACE ]
 ##
@@ -625,7 +625,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD ARROW WI
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD COMMA Bytes RPAR
 ##
-## Ends in an error in state: 341.
+## Ends in an error in state: 343.
 ##
 ## case_clause(base_if_then_else) -> VBAR pattern . ARROW base_if_then_else option(SEMI) [ VBAR RBRACE ]
 ##
@@ -636,16 +636,16 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE VBAR WILD COMMA By
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 327, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
-## In state 330, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
-## In state 339, spurious reduction of production pattern -> tuple(sub_pattern) 
+## In state 329, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
+## In state 332, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
+## In state 341, spurious reduction of production pattern -> tuple(sub_pattern) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE WILD
 ##
-## Ends in an error in state: 272.
+## Ends in an error in state: 274.
 ##
 ## switch_expr(base_if_then_else) -> Switch switch_expr_ LBRACE . cases(base_if_then_else) RBRACE [ SEMI RBRACE ]
 ##
@@ -657,7 +657,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE Switch True WILD
 ##
-## Ends in an error in state: 271.
+## Ends in an error in state: 273.
 ##
 ## switch_expr(base_if_then_else) -> Switch switch_expr_ . LBRACE cases(base_if_then_else) RBRACE [ SEMI RBRACE ]
 ##
@@ -669,7 +669,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch True WILD
 
 interactive_expr: If LPAR True RPAR LBRACE Switch WILD
 ##
-## Ends in an error in state: 230.
+## Ends in an error in state: 232.
 ##
 ## switch_expr(base_if_then_else) -> Switch . switch_expr_ LBRACE cases(base_if_then_else) RBRACE [ SEMI RBRACE ]
 ##
@@ -681,7 +681,7 @@ interactive_expr: If LPAR True RPAR LBRACE Switch WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True ARROW Bytes VBAR
 ##
-## Ends in an error in state: 443.
+## Ends in an error in state: 445.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if . option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -693,31 +693,31 @@ interactive_expr: If LPAR True RPAR LBRACE True ARROW Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 404, spurious reduction of production base_expr(closed_if) -> fun_expr 
-## In state 415, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
-## In state 414, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 406, spurious reduction of production base_expr(closed_if) -> fun_expr 
+## In state 417, spurious reduction of production base_if_then_else__open(closed_if) -> base_expr(closed_if) 
+## In state 416, spurious reduction of production closed_if -> base_if_then_else__open(closed_if) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 449.
+## Ends in an error in state: 451.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) . RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -729,7 +729,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True SEMI PLU
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ##
-## Ends in an error in state: 448.
+## Ends in an error in state: 450.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr . option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -740,27 +740,27 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 398, spurious reduction of production expr_with_let_expr -> expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 400, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE WILD
 ##
-## Ends in an error in state: 447.
+## Ends in an error in state: 449.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else LBRACE . expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -772,7 +772,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else LBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else WILD
 ##
-## Ends in an error in state: 446.
+## Ends in an error in state: 448.
 ##
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE Else . LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -784,7 +784,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE Else WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True RBRACE WILD
 ##
-## Ends in an error in state: 445.
+## Ends in an error in state: 447.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) RBRACE . Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -797,7 +797,7 @@ interactive_expr: If LPAR True RPAR LBRACE True RBRACE WILD
 
 interactive_expr: If LPAR True RPAR LBRACE True SEMI PLUS
 ##
-## Ends in an error in state: 444.
+## Ends in an error in state: 446.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE closed_if option(SEMI) . RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -810,7 +810,7 @@ interactive_expr: If LPAR True RPAR LBRACE True SEMI PLUS
 
 interactive_expr: If LPAR True RPAR LBRACE True VBAR
 ##
-## Ends in an error in state: 405.
+## Ends in an error in state: 407.
 ##
 ## base_expr(closed_if) -> disj_expr_level . [ SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ SEMI RBRACE Or BOOL_OR ARROW ]
@@ -824,23 +824,23 @@ interactive_expr: If LPAR True RPAR LBRACE True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: If LPAR True RPAR LBRACE WILD
 ##
-## Ends in an error in state: 229.
+## Ends in an error in state: 231.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr LBRACE . closed_if option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr LBRACE . closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -853,7 +853,7 @@ interactive_expr: If LPAR True RPAR LBRACE WILD
 
 interactive_expr: If LPAR True RPAR WILD
 ##
-## Ends in an error in state: 228.
+## Ends in an error in state: 230.
 ##
 ## if_then(expr_with_let_expr) -> If parenthesized_expr . LBRACE closed_if option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## if_then_else(expr_with_let_expr) -> If parenthesized_expr . LBRACE closed_if option(SEMI) RBRACE Else LBRACE expr_with_let_expr option(SEMI) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
@@ -866,7 +866,7 @@ interactive_expr: If LPAR True RPAR WILD
 
 interactive_expr: If LPAR True VBAR
 ##
-## Ends in an error in state: 223.
+## Ends in an error in state: 225.
 ##
 ## parenthesized_expr -> LPAR expr . RPAR [ LBRACE ]
 ##
@@ -877,19 +877,19 @@ interactive_expr: If LPAR True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -921,7 +921,7 @@ interactive_expr: If WILD
 
 interactive_expr: LBRACE ELLIPSIS Constr DOT Ident WILD
 ##
-## Ends in an error in state: 249.
+## Ends in an error in state: 251.
 ##
 ## projection -> Constr DOT Ident . selection [ COMMA ]
 ##
@@ -933,7 +933,7 @@ interactive_expr: LBRACE ELLIPSIS Constr DOT Ident WILD
 
 interactive_expr: LBRACE ELLIPSIS Constr DOT WILD
 ##
-## Ends in an error in state: 248.
+## Ends in an error in state: 250.
 ##
 ## projection -> Constr DOT . Ident selection [ COMMA ]
 ##
@@ -945,7 +945,7 @@ interactive_expr: LBRACE ELLIPSIS Constr DOT WILD
 
 interactive_expr: LBRACE ELLIPSIS Constr WILD
 ##
-## Ends in an error in state: 247.
+## Ends in an error in state: 249.
 ##
 ## projection -> Constr . DOT Ident selection [ COMMA ]
 ##
@@ -957,7 +957,7 @@ interactive_expr: LBRACE ELLIPSIS Constr WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 264.
+## Ends in an error in state: 266.
 ##
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment . COMMA nsepseq(field_path_assignment,COMMA) [ RBRACE ]
@@ -970,27 +970,27 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COLON Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 263, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) COLON expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 265, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COLON WILD
 ##
-## Ends in an error in state: 262.
+## Ends in an error in state: 264.
 ##
 ## field_path_assignment -> nsepseq(field_name,DOT) COLON . expr [ RBRACE COMMA ]
 ##
@@ -1002,7 +1002,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COLON WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 268.
+## Ends in an error in state: 270.
 ##
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment . [ RBRACE ]
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment . COMMA nsepseq(field_path_assignment,COMMA) [ RBRACE ]
@@ -1015,27 +1015,27 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 263, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) COLON expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 265, spurious reduction of production field_path_assignment -> nsepseq(field_name,DOT) COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 269.
+## Ends in an error in state: 271.
 ##
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment COMMA . nsepseq(field_path_assignment,COMMA) [ RBRACE ]
 ## seq(__anonymous_0(field_path_assignment,COMMA)) -> field_path_assignment COMMA . seq(__anonymous_0(field_path_assignment,COMMA)) [ RBRACE ]
@@ -1048,7 +1048,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 265.
+## Ends in an error in state: 267.
 ##
 ## nsepseq(field_path_assignment,COMMA) -> field_path_assignment COMMA . nsepseq(field_path_assignment,COMMA) [ RBRACE ]
 ## nseq(__anonymous_0(field_path_assignment,COMMA)) -> field_path_assignment COMMA . seq(__anonymous_0(field_path_assignment,COMMA)) [ RBRACE ]
@@ -1061,7 +1061,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident DOT Ident WILD
 ##
-## Ends in an error in state: 255.
+## Ends in an error in state: 257.
 ##
 ## nsepseq(field_name,DOT) -> Ident . [ COLON ]
 ## nsepseq(field_name,DOT) -> Ident . DOT nsepseq(field_name,DOT) [ COLON ]
@@ -1074,7 +1074,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident DOT Ident WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident DOT WILD
 ##
-## Ends in an error in state: 254.
+## Ends in an error in state: 256.
 ##
 ## nsepseq(field_name,DOT) -> Ident DOT . nsepseq(field_name,DOT) [ COLON ]
 ##
@@ -1086,7 +1086,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident DOT WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident WILD
 ##
-## Ends in an error in state: 253.
+## Ends in an error in state: 255.
 ##
 ## field_path_assignment -> Ident . [ RBRACE COMMA ]
 ## nsepseq(field_name,DOT) -> Ident . [ COLON ]
@@ -1100,7 +1100,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA Ident WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident COMMA WILD
 ##
-## Ends in an error in state: 252.
+## Ends in an error in state: 254.
 ##
 ## update_record -> LBRACE ELLIPSIS path COMMA . sep_or_term_list(field_path_assignment,COMMA) RBRACE [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1112,7 +1112,7 @@ interactive_expr: LBRACE ELLIPSIS Ident COMMA WILD
 
 interactive_expr: LBRACE ELLIPSIS Ident DOT Ident VBAR
 ##
-## Ends in an error in state: 251.
+## Ends in an error in state: 253.
 ##
 ## update_record -> LBRACE ELLIPSIS path . COMMA sep_or_term_list(field_path_assignment,COMMA) RBRACE [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1125,14 +1125,14 @@ interactive_expr: LBRACE ELLIPSIS Ident DOT Ident VBAR
 ## may provide an INCOMPLETE view of the future (what was expected next).
 ## In state 102, spurious reduction of production selection -> DOT Ident 
 ## In state 105, spurious reduction of production projection -> Ident selection 
-## In state 250, spurious reduction of production path -> projection 
+## In state 252, spurious reduction of production path -> projection 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE ELLIPSIS Ident WILD
 ##
-## Ends in an error in state: 246.
+## Ends in an error in state: 248.
 ##
 ## path -> Ident . [ COMMA ]
 ## projection -> Ident . selection [ COMMA ]
@@ -1145,7 +1145,7 @@ interactive_expr: LBRACE ELLIPSIS Ident WILD
 
 interactive_expr: LBRACE ELLIPSIS WILD
 ##
-## Ends in an error in state: 245.
+## Ends in an error in state: 247.
 ##
 ## update_record -> LBRACE ELLIPSIS . path COMMA sep_or_term_list(field_path_assignment,COMMA) RBRACE [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1157,7 +1157,7 @@ interactive_expr: LBRACE ELLIPSIS WILD
 
 interactive_expr: LBRACE Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 466.
+## Ends in an error in state: 468.
 ##
 ## sequence_or_record_in -> field_assignment . COMMA sep_or_term_list(field_assignment,COMMA) [ RBRACE ]
 ##
@@ -1168,27 +1168,27 @@ interactive_expr: LBRACE Ident COLON Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 465, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COLON WILD
 ##
-## Ends in an error in state: 462.
+## Ends in an error in state: 464.
 ##
 ## field_assignment -> Ident COLON . expr [ RBRACE COMMA ]
 ##
@@ -1200,7 +1200,7 @@ interactive_expr: LBRACE Ident COLON WILD
 
 interactive_expr: LBRACE Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 472.
+## Ends in an error in state: 474.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,COMMA) -> field_assignment . COMMA nsepseq(field_assignment,COMMA) [ RBRACE ]
@@ -1213,27 +1213,27 @@ interactive_expr: LBRACE Ident COMMA Ident COLON Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 465, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ##
-## Ends in an error in state: 476.
+## Ends in an error in state: 478.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment . [ RBRACE ]
 ## nsepseq(field_assignment,COMMA) -> field_assignment . COMMA nsepseq(field_assignment,COMMA) [ RBRACE ]
@@ -1246,27 +1246,27 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COLON Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 463, spurious reduction of production field_assignment -> Ident COLON expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 465, spurious reduction of production field_assignment -> Ident COLON expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 477.
+## Ends in an error in state: 479.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment COMMA . nsepseq(field_assignment,COMMA) [ RBRACE ]
 ## seq(__anonymous_0(field_assignment,COMMA)) -> field_assignment COMMA . seq(__anonymous_0(field_assignment,COMMA)) [ RBRACE ]
@@ -1279,7 +1279,7 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE Ident COMMA Ident COMMA WILD
 ##
-## Ends in an error in state: 473.
+## Ends in an error in state: 475.
 ##
 ## nsepseq(field_assignment,COMMA) -> field_assignment COMMA . nsepseq(field_assignment,COMMA) [ RBRACE ]
 ## nseq(__anonymous_0(field_assignment,COMMA)) -> field_assignment COMMA . seq(__anonymous_0(field_assignment,COMMA)) [ RBRACE ]
@@ -1292,7 +1292,7 @@ interactive_expr: LBRACE Ident COMMA Ident COMMA WILD
 
 interactive_expr: LBRACE Ident COMMA Ident WILD
 ##
-## Ends in an error in state: 468.
+## Ends in an error in state: 470.
 ##
 ## field_assignment -> Ident . [ RBRACE COMMA ]
 ## field_assignment -> Ident . COLON expr [ RBRACE COMMA ]
@@ -1305,7 +1305,7 @@ interactive_expr: LBRACE Ident COMMA Ident WILD
 
 interactive_expr: LBRACE Ident COMMA WILD
 ##
-## Ends in an error in state: 467.
+## Ends in an error in state: 469.
 ##
 ## sequence_or_record_in -> field_assignment COMMA . sep_or_term_list(field_assignment,COMMA) [ RBRACE ]
 ##
@@ -1317,7 +1317,7 @@ interactive_expr: LBRACE Ident COMMA WILD
 
 interactive_expr: LBRACE Ident WILD
 ##
-## Ends in an error in state: 461.
+## Ends in an error in state: 463.
 ##
 ## common_expr -> Ident . [ TIMES SLASH SEMI RBRACE PLUS Or NE Mod MINUS LT LPAR LE GT GE EQEQ COLON CAT BOOL_OR BOOL_AND ARROW ]
 ## field_assignment -> Ident . [ COMMA ]
@@ -1332,7 +1332,7 @@ interactive_expr: LBRACE Ident WILD
 
 interactive_expr: LBRACE True SEMI True SEMI True SEMI WILD
 ##
-## Ends in an error in state: 489.
+## Ends in an error in state: 491.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr SEMI . nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
 ## seq(__anonymous_0(expr_with_let_expr,SEMI)) -> expr_with_let_expr SEMI . seq(__anonymous_0(expr_with_let_expr,SEMI)) [ RBRACE ]
@@ -1345,7 +1345,7 @@ interactive_expr: LBRACE True SEMI True SEMI True SEMI WILD
 
 interactive_expr: LBRACE True SEMI True SEMI True VBAR
 ##
-## Ends in an error in state: 488.
+## Ends in an error in state: 490.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . [ RBRACE ]
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . SEMI nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1358,27 +1358,27 @@ interactive_expr: LBRACE True SEMI True SEMI True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 398, spurious reduction of production expr_with_let_expr -> expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 400, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE True SEMI True SEMI WILD
 ##
-## Ends in an error in state: 485.
+## Ends in an error in state: 487.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr SEMI . nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
 ## nseq(__anonymous_0(expr_with_let_expr,SEMI)) -> expr_with_let_expr SEMI . seq(__anonymous_0(expr_with_let_expr,SEMI)) [ RBRACE ]
@@ -1391,7 +1391,7 @@ interactive_expr: LBRACE True SEMI True SEMI WILD
 
 interactive_expr: LBRACE True SEMI True VBAR
 ##
-## Ends in an error in state: 484.
+## Ends in an error in state: 486.
 ##
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . [ RBRACE ]
 ## nsepseq(expr_with_let_expr,SEMI) -> expr_with_let_expr . SEMI nsepseq(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1404,27 +1404,27 @@ interactive_expr: LBRACE True SEMI True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 398, spurious reduction of production expr_with_let_expr -> expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 400, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACE True SEMI WILD
 ##
-## Ends in an error in state: 480.
+## Ends in an error in state: 482.
 ##
 ## option(SEMI) -> SEMI . [ RBRACE ]
 ## sequence_or_record_in -> expr_with_let_expr SEMI . sep_or_term_list(expr_with_let_expr,SEMI) [ RBRACE ]
@@ -1437,7 +1437,7 @@ interactive_expr: LBRACE True SEMI WILD
 
 interactive_expr: LBRACE True VBAR
 ##
-## Ends in an error in state: 479.
+## Ends in an error in state: 481.
 ##
 ## sequence_or_record_in -> expr_with_let_expr . SEMI sep_or_term_list(expr_with_let_expr,SEMI) [ RBRACE ]
 ## sequence_or_record_in -> expr_with_let_expr . option(SEMI) [ RBRACE ]
@@ -1449,20 +1449,20 @@ interactive_expr: LBRACE True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 398, spurious reduction of production expr_with_let_expr -> expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 400, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1482,7 +1482,7 @@ interactive_expr: LBRACE WILD
 
 interactive_expr: LBRACKET True COMMA ELLIPSIS True VBAR
 ##
-## Ends in an error in state: 498.
+## Ends in an error in state: 500.
 ##
 ## list_or_spread -> LBRACKET expr COMMA ELLIPSIS expr . RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1493,26 +1493,26 @@ interactive_expr: LBRACKET True COMMA ELLIPSIS True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True COMMA ELLIPSIS WILD
 ##
-## Ends in an error in state: 497.
+## Ends in an error in state: 499.
 ##
 ## list_or_spread -> LBRACKET expr COMMA ELLIPSIS . expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -1524,7 +1524,7 @@ interactive_expr: LBRACKET True COMMA ELLIPSIS WILD
 
 interactive_expr: LBRACKET True COMMA True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 508.
+## Ends in an error in state: 510.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RBRACKET ]
 ## seq(__anonymous_0(expr,COMMA)) -> expr COMMA . seq(__anonymous_0(expr,COMMA)) [ RBRACKET ]
@@ -1537,7 +1537,7 @@ interactive_expr: LBRACKET True COMMA True COMMA True COMMA WILD
 
 interactive_expr: LBRACKET True COMMA True COMMA True VBAR
 ##
-## Ends in an error in state: 507.
+## Ends in an error in state: 509.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RBRACKET ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RBRACKET ]
@@ -1550,26 +1550,26 @@ interactive_expr: LBRACKET True COMMA True COMMA True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 505.
+## Ends in an error in state: 507.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RBRACKET ]
 ## nseq(__anonymous_0(expr,COMMA)) -> expr COMMA . seq(__anonymous_0(expr,COMMA)) [ RBRACKET ]
@@ -1582,7 +1582,7 @@ interactive_expr: LBRACKET True COMMA True COMMA WILD
 
 interactive_expr: LBRACKET True COMMA True VBAR
 ##
-## Ends in an error in state: 504.
+## Ends in an error in state: 506.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RBRACKET ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RBRACKET ]
@@ -1595,26 +1595,26 @@ interactive_expr: LBRACKET True COMMA True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LBRACKET True COMMA WILD
 ##
-## Ends in an error in state: 496.
+## Ends in an error in state: 498.
 ##
 ## list_or_spread -> LBRACKET expr COMMA . sep_or_term_list(expr,COMMA) RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## list_or_spread -> LBRACKET expr COMMA . ELLIPSIS expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -1627,7 +1627,7 @@ interactive_expr: LBRACKET True COMMA WILD
 
 interactive_expr: LBRACKET True VBAR
 ##
-## Ends in an error in state: 495.
+## Ends in an error in state: 497.
 ##
 ## list_or_spread -> LBRACKET expr . COMMA sep_or_term_list(expr,COMMA) RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## list_or_spread -> LBRACKET expr . COMMA ELLIPSIS expr RBRACKET [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -1640,19 +1640,19 @@ interactive_expr: LBRACKET True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1673,7 +1673,7 @@ interactive_expr: LBRACKET WILD
 
 interactive_expr: LPAR True COMMA Bytes RPAR COLON Ident TIMES
 ##
-## Ends in an error in state: 162.
+## Ends in an error in state: 164.
 ##
 ## base_expr(expr) -> disj_expr_level . [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or Let EOF COMMA BOOL_OR Attr ARROW ]
@@ -1687,18 +1687,18 @@ interactive_expr: LPAR True COMMA Bytes RPAR COLON Ident TIMES
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 130, spurious reduction of production option(type_expr_simple_args) -> 
-## In state 139, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
-## In state 146, spurious reduction of production type_annotation_simple -> COLON type_expr_simple 
-## In state 147, spurious reduction of production option(type_annotation_simple) -> type_annotation_simple 
-## In state 148, spurious reduction of production disj_expr_level -> par(tuple(disj_expr_level)) option(type_annotation_simple) 
+## In state 132, spurious reduction of production option(type_expr_simple_args) -> 
+## In state 141, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
+## In state 148, spurious reduction of production type_annotation_simple -> COLON type_expr_simple 
+## In state 149, spurious reduction of production option(type_annotation_simple) -> type_annotation_simple 
+## In state 150, spurious reduction of production disj_expr_level -> par(tuple(disj_expr_level)) option(type_annotation_simple) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR True COMMA Bytes RPAR WILD
 ##
-## Ends in an error in state: 127.
+## Ends in an error in state: 129.
 ##
 ## disj_expr_level -> par(tuple(disj_expr_level)) . option(type_annotation_simple) [ VBAR Type SEMI RPAR RBRACKET RBRACE Or Let EOF COMMA BOOL_OR Attr ARROW ]
 ##
@@ -1710,7 +1710,7 @@ interactive_expr: LPAR True COMMA Bytes RPAR WILD
 
 interactive_expr: LPAR True COMMA True COMMA WILD
 ##
-## Ends in an error in state: 459.
+## Ends in an error in state: 461.
 ##
 ## nsepseq(disj_expr_level,COMMA) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ RPAR ]
 ##
@@ -1722,7 +1722,7 @@ interactive_expr: LPAR True COMMA True COMMA WILD
 
 interactive_expr: LPAR True COMMA True VBAR
 ##
-## Ends in an error in state: 458.
+## Ends in an error in state: 460.
 ##
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ RPAR Or COMMA BOOL_OR ]
 ## bin_op(disj_expr_level,Or,conj_expr_level) -> disj_expr_level . Or conj_expr_level [ RPAR Or COMMA BOOL_OR ]
@@ -1736,23 +1736,23 @@ interactive_expr: LPAR True COMMA True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: LPAR True COMMA WILD
 ##
-## Ends in an error in state: 456.
+## Ends in an error in state: 458.
 ##
 ## tuple(disj_expr_level) -> disj_expr_level COMMA . nsepseq(disj_expr_level,COMMA) [ RPAR ]
 ##
@@ -1764,7 +1764,7 @@ interactive_expr: LPAR True COMMA WILD
 
 interactive_expr: LPAR True VBAR
 ##
-## Ends in an error in state: 455.
+## Ends in an error in state: 457.
 ##
 ## base_expr(expr) -> disj_expr_level . [ RPAR ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ RPAR Or COMMA BOOL_OR ARROW ]
@@ -1779,16 +1779,16 @@ interactive_expr: LPAR True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1809,7 +1809,7 @@ interactive_expr: LPAR WILD
 
 interactive_expr: Let Rec VBAR
 ##
-## Ends in an error in state: 352.
+## Ends in an error in state: 354.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec . let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1821,7 +1821,7 @@ interactive_expr: Let Rec VBAR
 
 interactive_expr: Let Rec WILD EQ Bytes SEMI WILD
 ##
-## Ends in an error in state: 395.
+## Ends in an error in state: 397.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec let_binding SEMI . expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1833,7 +1833,7 @@ interactive_expr: Let Rec WILD EQ Bytes SEMI WILD
 
 interactive_expr: Let Rec WILD EQ Bytes VBAR
 ##
-## Ends in an error in state: 394.
+## Ends in an error in state: 396.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let Rec let_binding . SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1844,27 +1844,27 @@ interactive_expr: Let Rec WILD EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 532, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Let VBAR
 ##
-## Ends in an error in state: 351.
+## Ends in an error in state: 353.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let . let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let . Rec let_binding SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
@@ -1877,7 +1877,7 @@ interactive_expr: Let VBAR
 
 interactive_expr: Let WILD EQ Bytes SEMI WILD
 ##
-## Ends in an error in state: 400.
+## Ends in an error in state: 402.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let let_binding SEMI . expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1889,7 +1889,7 @@ interactive_expr: Let WILD EQ Bytes SEMI WILD
 
 interactive_expr: Let WILD EQ Bytes VBAR
 ##
-## Ends in an error in state: 399.
+## Ends in an error in state: 401.
 ##
 ## let_expr(expr_with_let_expr) -> seq(Attr) Let let_binding . SEMI expr_with_let_expr [ SEMI RBRACE EOF ]
 ##
@@ -1900,20 +1900,20 @@ interactive_expr: Let WILD EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 532, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -1944,9 +1944,9 @@ interactive_expr: NOT WILD
 
 interactive_expr: Switch Constr WILD
 ##
-## Ends in an error in state: 111.
+## Ends in an error in state: 113.
 ##
-## module_field -> Constr . DOT Ident [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
+## module_field -> Constr . DOT module_fun [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## projection -> Constr . DOT Ident selection [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
 ## The known suffix of the stack is as follows:
@@ -1957,7 +1957,7 @@ interactive_expr: Switch Constr WILD
 
 interactive_expr: Switch LBRACE WILD
 ##
-## Ends in an error in state: 244.
+## Ends in an error in state: 246.
 ##
 ## update_record -> LBRACE . ELLIPSIS path COMMA sep_or_term_list(field_path_assignment,COMMA) RBRACE [ LBRACE ]
 ##
@@ -1969,7 +1969,7 @@ interactive_expr: Switch LBRACE WILD
 
 interactive_expr: Switch LBRACKET True SEMI True SEMI WILD
 ##
-## Ends in an error in state: 242.
+## Ends in an error in state: 244.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET ]
 ## seq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET ]
@@ -1982,7 +1982,7 @@ interactive_expr: Switch LBRACKET True SEMI True SEMI WILD
 
 interactive_expr: Switch LBRACKET True SEMI True VBAR
 ##
-## Ends in an error in state: 241.
+## Ends in an error in state: 243.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET ]
@@ -1995,26 +1995,26 @@ interactive_expr: Switch LBRACKET True SEMI True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch LBRACKET True SEMI WILD
 ##
-## Ends in an error in state: 238.
+## Ends in an error in state: 240.
 ##
 ## nsepseq(expr,SEMI) -> expr SEMI . nsepseq(expr,SEMI) [ RBRACKET ]
 ## nseq(__anonymous_0(expr,SEMI)) -> expr SEMI . seq(__anonymous_0(expr,SEMI)) [ RBRACKET ]
@@ -2027,7 +2027,7 @@ interactive_expr: Switch LBRACKET True SEMI WILD
 
 interactive_expr: Switch LBRACKET True VBAR
 ##
-## Ends in an error in state: 237.
+## Ends in an error in state: 239.
 ##
 ## nsepseq(expr,SEMI) -> expr . [ RBRACKET ]
 ## nsepseq(expr,SEMI) -> expr . SEMI nsepseq(expr,SEMI) [ RBRACKET ]
@@ -2040,26 +2040,26 @@ interactive_expr: Switch LBRACKET True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch LBRACKET WILD
 ##
-## Ends in an error in state: 231.
+## Ends in an error in state: 233.
 ##
 ## list__(expr) -> LBRACKET . option(sep_or_term_list(expr,SEMI)) RBRACKET [ LBRACE ]
 ##
@@ -2071,7 +2071,7 @@ interactive_expr: Switch LBRACKET WILD
 
 interactive_expr: Switch LPAR True VBAR
 ##
-## Ends in an error in state: 453.
+## Ends in an error in state: 455.
 ##
 ## par(expr) -> LPAR expr . RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LPAR LE LBRACE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2082,19 +2082,19 @@ interactive_expr: Switch LPAR True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -2114,7 +2114,7 @@ interactive_expr: Switch LPAR WILD
 
 interactive_expr: Switch True LBRACE VBAR LBRACKET VBAR
 ##
-## Ends in an error in state: 333.
+## Ends in an error in state: 335.
 ##
 ## list__(sub_pattern) -> LBRACKET . option(sep_or_term_list(sub_pattern,SEMI)) RBRACKET [ COMMA ARROW ]
 ## pattern -> LBRACKET . sub_pattern COMMA ELLIPSIS sub_pattern RBRACKET [ ARROW ]
@@ -2127,7 +2127,7 @@ interactive_expr: Switch True LBRACE VBAR LBRACKET VBAR
 
 interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA ELLIPSIS VBAR
 ##
-## Ends in an error in state: 336.
+## Ends in an error in state: 338.
 ##
 ## pattern -> LBRACKET sub_pattern COMMA ELLIPSIS . sub_pattern RBRACKET [ ARROW ]
 ##
@@ -2139,7 +2139,7 @@ interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA ELLIPSIS VBAR
 
 interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA ELLIPSIS WILD WILD
 ##
-## Ends in an error in state: 337.
+## Ends in an error in state: 339.
 ##
 ## pattern -> LBRACKET sub_pattern COMMA ELLIPSIS sub_pattern . RBRACKET [ ARROW ]
 ##
@@ -2151,7 +2151,7 @@ interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA ELLIPSIS WILD WILD
 
 interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA WILD
 ##
-## Ends in an error in state: 335.
+## Ends in an error in state: 337.
 ##
 ## pattern -> LBRACKET sub_pattern COMMA . ELLIPSIS sub_pattern RBRACKET [ ARROW ]
 ##
@@ -2163,7 +2163,7 @@ interactive_expr: Switch True LBRACE VBAR LBRACKET WILD COMMA WILD
 
 interactive_expr: Switch True LBRACE VBAR LBRACKET WILD WILD
 ##
-## Ends in an error in state: 334.
+## Ends in an error in state: 336.
 ##
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . [ RBRACKET ]
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . SEMI nsepseq(sub_pattern,SEMI) [ RBRACKET ]
@@ -2178,7 +2178,7 @@ interactive_expr: Switch True LBRACE VBAR LBRACKET WILD WILD
 
 interactive_expr: Switch True LBRACE VBAR LPAR Bytes RPAR WILD
 ##
-## Ends in an error in state: 340.
+## Ends in an error in state: 342.
 ##
 ## tuple(sub_pattern) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ ARROW ]
 ##
@@ -2190,7 +2190,7 @@ interactive_expr: Switch True LBRACE VBAR LPAR Bytes RPAR WILD
 
 interactive_expr: Switch True LBRACE VBAR VBAR
 ##
-## Ends in an error in state: 513.
+## Ends in an error in state: 515.
 ##
 ## case_clause(base_cond) -> VBAR . pattern ARROW base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2202,7 +2202,7 @@ interactive_expr: Switch True LBRACE VBAR VBAR
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 526.
+## Ends in an error in state: 528.
 ##
 ## nseq(case_clause(base_cond)) -> case_clause(base_cond) . seq(case_clause(base_cond)) [ RBRACE ]
 ##
@@ -2214,7 +2214,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes SEMI WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Bytes SEMI WILD
 ##
-## Ends in an error in state: 528.
+## Ends in an error in state: 530.
 ##
 ## seq(case_clause(base_cond)) -> case_clause(base_cond) . seq(case_clause(base_cond)) [ RBRACE ]
 ##
@@ -2226,7 +2226,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW Bytes VBAR Bytes ARROW Byte
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ##
-## Ends in an error in state: 521.
+## Ends in an error in state: 523.
 ##
 ## case_clause(base_cond) -> VBAR pattern ARROW base_cond . option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2237,31 +2237,31 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW True ARROW Bytes Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 213, spurious reduction of production es6_func -> ARROW expr 
-## In state 221, spurious reduction of production fun_expr -> disj_expr_level es6_func 
-## In state 516, spurious reduction of production base_expr(base_cond) -> fun_expr 
-## In state 519, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
-## In state 520, spurious reduction of production base_cond -> base_cond__open(base_cond) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 215, spurious reduction of production es6_func -> ARROW expr 
+## In state 223, spurious reduction of production fun_expr -> disj_expr_level es6_func 
+## In state 518, spurious reduction of production base_expr(base_cond) -> fun_expr 
+## In state 521, spurious reduction of production base_cond__open(base_cond) -> base_expr(base_cond) 
+## In state 522, spurious reduction of production base_cond -> base_cond__open(base_cond) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW True Type
 ##
-## Ends in an error in state: 517.
+## Ends in an error in state: 519.
 ##
 ## base_expr(base_cond) -> disj_expr_level . [ VBAR SEMI RBRACE ]
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level . BOOL_OR conj_expr_level [ VBAR SEMI RBRACE Or BOOL_OR ARROW ]
@@ -2275,23 +2275,23 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW True Type
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch True LBRACE VBAR WILD ARROW WILD
 ##
-## Ends in an error in state: 515.
+## Ends in an error in state: 517.
 ##
 ## case_clause(base_cond) -> VBAR pattern ARROW . base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2303,7 +2303,7 @@ interactive_expr: Switch True LBRACE VBAR WILD ARROW WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD COMMA Bytes RPAR
 ##
-## Ends in an error in state: 514.
+## Ends in an error in state: 516.
 ##
 ## case_clause(base_cond) -> VBAR pattern . ARROW base_cond option(SEMI) [ VBAR RBRACE ]
 ##
@@ -2314,16 +2314,16 @@ interactive_expr: Switch True LBRACE VBAR WILD COMMA Bytes RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 327, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
-## In state 330, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
-## In state 339, spurious reduction of production pattern -> tuple(sub_pattern) 
+## In state 329, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
+## In state 332, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
+## In state 341, spurious reduction of production pattern -> tuple(sub_pattern) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: Switch True LBRACE VBAR WILD COMMA VBAR
 ##
-## Ends in an error in state: 326.
+## Ends in an error in state: 328.
 ##
 ## tuple(sub_pattern) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ RPAR ARROW ]
 ##
@@ -2335,7 +2335,7 @@ interactive_expr: Switch True LBRACE VBAR WILD COMMA VBAR
 
 interactive_expr: Switch True LBRACE VBAR WILD COMMA WILD COMMA VBAR
 ##
-## Ends in an error in state: 328.
+## Ends in an error in state: 330.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern COMMA . nsepseq(sub_pattern,COMMA) [ RPAR ARROW ]
 ##
@@ -2347,7 +2347,7 @@ interactive_expr: Switch True LBRACE VBAR WILD COMMA WILD COMMA VBAR
 
 interactive_expr: Switch True LBRACE VBAR WILD COMMA WILD WILD
 ##
-## Ends in an error in state: 327.
+## Ends in an error in state: 329.
 ##
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . [ RPAR ARROW ]
 ## nsepseq(sub_pattern,COMMA) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ RPAR ARROW ]
@@ -2360,7 +2360,7 @@ interactive_expr: Switch True LBRACE VBAR WILD COMMA WILD WILD
 
 interactive_expr: Switch True LBRACE VBAR WILD WILD
 ##
-## Ends in an error in state: 431.
+## Ends in an error in state: 433.
 ##
 ## pattern -> core_pattern . [ ARROW ]
 ## sub_pattern -> core_pattern . [ COMMA ]
@@ -2373,7 +2373,7 @@ interactive_expr: Switch True LBRACE VBAR WILD WILD
 
 interactive_expr: Switch True LBRACE WILD
 ##
-## Ends in an error in state: 512.
+## Ends in an error in state: 514.
 ##
 ## switch_expr(base_cond) -> Switch switch_expr_ LBRACE . cases(base_cond) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -2385,7 +2385,7 @@ interactive_expr: Switch True LBRACE WILD
 
 interactive_expr: Switch True WILD
 ##
-## Ends in an error in state: 511.
+## Ends in an error in state: 513.
 ##
 ## switch_expr(base_cond) -> Switch switch_expr_ . LBRACE cases(base_cond) RBRACE [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -2409,7 +2409,7 @@ interactive_expr: Switch WILD
 
 interactive_expr: True ARROW WILD
 ##
-## Ends in an error in state: 212.
+## Ends in an error in state: 214.
 ##
 ## es6_func -> ARROW . expr [ VBAR Type SEMI RPAR RBRACKET RBRACE Let EOF COMMA Attr ]
 ##
@@ -2421,7 +2421,7 @@ interactive_expr: True ARROW WILD
 
 interactive_expr: True BOOL_AND WILD
 ##
-## Ends in an error in state: 166.
+## Ends in an error in state: 168.
 ##
 ## bin_op(conj_expr_level,BOOL_AND,comp_expr_level) -> conj_expr_level BOOL_AND . comp_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or Let EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2433,7 +2433,7 @@ interactive_expr: True BOOL_AND WILD
 
 interactive_expr: True BOOL_OR WILD
 ##
-## Ends in an error in state: 210.
+## Ends in an error in state: 212.
 ##
 ## bin_op(disj_expr_level,BOOL_OR,conj_expr_level) -> disj_expr_level BOOL_OR . conj_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or Let EOF COMMA BOOL_OR Attr ARROW ]
 ##
@@ -2445,7 +2445,7 @@ interactive_expr: True BOOL_OR WILD
 
 interactive_expr: True CAT WILD
 ##
-## Ends in an error in state: 189.
+## Ends in an error in state: 191.
 ##
 ## bin_op(add_expr_level,CAT,cat_expr_level) -> add_expr_level CAT . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2457,7 +2457,7 @@ interactive_expr: True CAT WILD
 
 interactive_expr: True COLON Ident LPAR Ident VBAR
 ##
-## Ends in an error in state: 132.
+## Ends in an error in state: 134.
 ##
 ## nsepseq(type_expr_simple,COMMA) -> type_expr_simple . [ RPAR ]
 ## nsepseq(type_expr_simple,COMMA) -> type_expr_simple . COMMA nsepseq(type_expr_simple,COMMA) [ RPAR ]
@@ -2469,15 +2469,15 @@ interactive_expr: True COLON Ident LPAR Ident VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 130, spurious reduction of production option(type_expr_simple_args) -> 
-## In state 139, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
+## In state 132, spurious reduction of production option(type_expr_simple_args) -> 
+## In state 141, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True COLON Ident LPAR WILD
 ##
-## Ends in an error in state: 131.
+## Ends in an error in state: 133.
 ##
 ## par(nsepseq(type_expr_simple,COMMA)) -> LPAR . nsepseq(type_expr_simple,COMMA) RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2489,7 +2489,7 @@ interactive_expr: True COLON Ident LPAR WILD
 
 interactive_expr: True COLON Ident WILD
 ##
-## Ends in an error in state: 130.
+## Ends in an error in state: 132.
 ##
 ## type_expr_simple -> Ident . option(type_expr_simple_args) [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2501,7 +2501,7 @@ interactive_expr: True COLON Ident WILD
 
 interactive_expr: True COLON LPAR Ident ARROW Ident VBAR
 ##
-## Ends in an error in state: 142.
+## Ends in an error in state: 144.
 ##
 ## type_expr_simple -> LPAR type_expr_simple ARROW type_expr_simple . RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2512,15 +2512,15 @@ interactive_expr: True COLON LPAR Ident ARROW Ident VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 130, spurious reduction of production option(type_expr_simple_args) -> 
-## In state 139, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
+## In state 132, spurious reduction of production option(type_expr_simple_args) -> 
+## In state 141, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True COLON LPAR Ident ARROW WILD
 ##
-## Ends in an error in state: 141.
+## Ends in an error in state: 143.
 ##
 ## type_expr_simple -> LPAR type_expr_simple ARROW . type_expr_simple RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2532,7 +2532,7 @@ interactive_expr: True COLON LPAR Ident ARROW WILD
 
 interactive_expr: True COLON LPAR Ident COMMA WILD
 ##
-## Ends in an error in state: 133.
+## Ends in an error in state: 135.
 ##
 ## nsepseq(type_expr_simple,COMMA) -> type_expr_simple COMMA . nsepseq(type_expr_simple,COMMA) [ RPAR ]
 ##
@@ -2544,7 +2544,7 @@ interactive_expr: True COLON LPAR Ident COMMA WILD
 
 interactive_expr: True COLON LPAR Ident RPAR WILD
 ##
-## Ends in an error in state: 149.
+## Ends in an error in state: 151.
 ##
 ## add_expr_level -> mult_expr_level . [ VBAR Type SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2559,7 +2559,7 @@ interactive_expr: True COLON LPAR Ident RPAR WILD
 
 interactive_expr: True COLON LPAR Ident VBAR
 ##
-## Ends in an error in state: 140.
+## Ends in an error in state: 142.
 ##
 ## nsepseq(type_expr_simple,COMMA) -> type_expr_simple . [ RPAR ]
 ## nsepseq(type_expr_simple,COMMA) -> type_expr_simple . COMMA nsepseq(type_expr_simple,COMMA) [ RPAR ]
@@ -2572,15 +2572,15 @@ interactive_expr: True COLON LPAR Ident VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 130, spurious reduction of production option(type_expr_simple_args) -> 
-## In state 139, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
+## In state 132, spurious reduction of production option(type_expr_simple_args) -> 
+## In state 141, spurious reduction of production type_expr_simple -> Ident option(type_expr_simple_args) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True COLON LPAR WILD
 ##
-## Ends in an error in state: 129.
+## Ends in an error in state: 131.
 ##
 ## type_expr_simple -> LPAR . nsepseq(type_expr_simple,COMMA) RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## type_expr_simple -> LPAR . type_expr_simple ARROW type_expr_simple RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2593,7 +2593,7 @@ interactive_expr: True COLON LPAR WILD
 
 interactive_expr: True COLON WILD
 ##
-## Ends in an error in state: 128.
+## Ends in an error in state: 130.
 ##
 ## type_annotation_simple -> COLON . type_expr_simple [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2605,7 +2605,7 @@ interactive_expr: True COLON WILD
 
 interactive_expr: True EQEQ WILD
 ##
-## Ends in an error in state: 199.
+## Ends in an error in state: 201.
 ##
 ## bin_op(comp_expr_level,EQEQ,cat_expr_level) -> comp_expr_level EQEQ . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2617,7 +2617,7 @@ interactive_expr: True EQEQ WILD
 
 interactive_expr: True GE WILD
 ##
-## Ends in an error in state: 197.
+## Ends in an error in state: 199.
 ##
 ## bin_op(comp_expr_level,GE,cat_expr_level) -> comp_expr_level GE . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2629,7 +2629,7 @@ interactive_expr: True GE WILD
 
 interactive_expr: True GT WILD
 ##
-## Ends in an error in state: 195.
+## Ends in an error in state: 197.
 ##
 ## bin_op(comp_expr_level,GT,cat_expr_level) -> comp_expr_level GT . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2641,7 +2641,7 @@ interactive_expr: True GT WILD
 
 interactive_expr: True LE WILD
 ##
-## Ends in an error in state: 193.
+## Ends in an error in state: 195.
 ##
 ## bin_op(comp_expr_level,LE,cat_expr_level) -> comp_expr_level LE . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2653,7 +2653,7 @@ interactive_expr: True LE WILD
 
 interactive_expr: True LPAR True COMMA WILD
 ##
-## Ends in an error in state: 160.
+## Ends in an error in state: 162.
 ##
 ## nsepseq(expr,COMMA) -> expr COMMA . nsepseq(expr,COMMA) [ RPAR ]
 ##
@@ -2665,7 +2665,7 @@ interactive_expr: True LPAR True COMMA WILD
 
 interactive_expr: True LPAR True VBAR
 ##
-## Ends in an error in state: 159.
+## Ends in an error in state: 161.
 ##
 ## nsepseq(expr,COMMA) -> expr . [ RPAR ]
 ## nsepseq(expr,COMMA) -> expr . COMMA nsepseq(expr,COMMA) [ RPAR ]
@@ -2677,26 +2677,26 @@ interactive_expr: True LPAR True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
 ##
 
 Missing `)`.
 
 interactive_expr: True LPAR WILD
 ##
-## Ends in an error in state: 153.
+## Ends in an error in state: 155.
 ##
 ## call_expr -> core_expr LPAR . nsepseq(expr,COMMA) RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## unit -> LPAR . RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2709,7 +2709,7 @@ interactive_expr: True LPAR WILD
 
 interactive_expr: True LT WILD
 ##
-## Ends in an error in state: 191.
+## Ends in an error in state: 193.
 ##
 ## bin_op(comp_expr_level,LT,cat_expr_level) -> comp_expr_level LT . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2721,7 +2721,7 @@ interactive_expr: True LT WILD
 
 interactive_expr: True MINUS True COLON LPAR Ident RPAR WILD
 ##
-## Ends in an error in state: 188.
+## Ends in an error in state: 190.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS mult_expr_level . [ VBAR Type SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2736,7 +2736,7 @@ interactive_expr: True MINUS True COLON LPAR Ident RPAR WILD
 
 interactive_expr: True MINUS WILD
 ##
-## Ends in an error in state: 187.
+## Ends in an error in state: 189.
 ##
 ## bin_op(add_expr_level,MINUS,mult_expr_level) -> add_expr_level MINUS . mult_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2748,7 +2748,7 @@ interactive_expr: True MINUS WILD
 
 interactive_expr: True Mod WILD
 ##
-## Ends in an error in state: 185.
+## Ends in an error in state: 187.
 ##
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level Mod . unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2760,7 +2760,7 @@ interactive_expr: True Mod WILD
 
 interactive_expr: True NE WILD
 ##
-## Ends in an error in state: 168.
+## Ends in an error in state: 170.
 ##
 ## bin_op(comp_expr_level,NE,cat_expr_level) -> comp_expr_level NE . cat_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or NE Let LT LE GT GE EQEQ EOF COMMA BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2772,7 +2772,7 @@ interactive_expr: True NE WILD
 
 interactive_expr: True Or WILD
 ##
-## Ends in an error in state: 163.
+## Ends in an error in state: 165.
 ##
 ## bin_op(disj_expr_level,Or,conj_expr_level) -> disj_expr_level Or . conj_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE Or Let EOF COMMA BOOL_OR Attr ARROW ]
 ##
@@ -2784,7 +2784,7 @@ interactive_expr: True Or WILD
 
 interactive_expr: True PLUS True COLON LPAR Ident RPAR WILD
 ##
-## Ends in an error in state: 182.
+## Ends in an error in state: 184.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS mult_expr_level . [ VBAR Type SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## bin_op(mult_expr_level,Mod,unary_expr_level) -> mult_expr_level . Mod unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2799,7 +2799,7 @@ interactive_expr: True PLUS True COLON LPAR Ident RPAR WILD
 
 interactive_expr: True PLUS WILD
 ##
-## Ends in an error in state: 181.
+## Ends in an error in state: 183.
 ##
 ## bin_op(add_expr_level,PLUS,mult_expr_level) -> add_expr_level PLUS . mult_expr_level [ VBAR Type SEMI RPAR RBRACKET RBRACE PLUS Or NE MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2811,7 +2811,7 @@ interactive_expr: True PLUS WILD
 
 interactive_expr: True SLASH WILD
 ##
-## Ends in an error in state: 183.
+## Ends in an error in state: 185.
 ##
 ## bin_op(mult_expr_level,SLASH,unary_expr_level) -> mult_expr_level SLASH . unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2823,7 +2823,7 @@ interactive_expr: True SLASH WILD
 
 interactive_expr: True TIMES WILD
 ##
-## Ends in an error in state: 150.
+## Ends in an error in state: 152.
 ##
 ## bin_op(mult_expr_level,TIMES,unary_expr_level) -> mult_expr_level TIMES . unary_expr_level [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA CAT BOOL_OR BOOL_AND Attr ARROW ]
 ##
@@ -2835,7 +2835,7 @@ interactive_expr: True TIMES WILD
 
 interactive_expr: True VBAR
 ##
-## Ends in an error in state: 541.
+## Ends in an error in state: 545.
 ##
 ## interactive_expr -> expr_with_let_expr . EOF [ # ]
 ##
@@ -2846,27 +2846,27 @@ interactive_expr: True VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 398, spurious reduction of production expr_with_let_expr -> expr 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 400, spurious reduction of production expr_with_let_expr -> expr 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 interactive_expr: True WILD
 ##
-## Ends in an error in state: 152.
+## Ends in an error in state: 154.
 ##
 ## call_expr -> core_expr . LPAR nsepseq(expr,COMMA) RPAR [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
 ## call_expr -> core_expr . unit [ VBAR Type TIMES SLASH SEMI RPAR RBRACKET RBRACE PLUS Or NE Mod MINUS Let LT LE GT GE EQEQ EOF COMMA COLON CAT BOOL_OR BOOL_AND Attr ARROW ]
@@ -2880,7 +2880,7 @@ interactive_expr: True WILD
 
 interactive_expr: WILD
 ##
-## Ends in an error in state: 539.
+## Ends in an error in state: 543.
 ##
 ## interactive_expr' -> . interactive_expr [ # ]
 ##
@@ -2904,7 +2904,7 @@ contract: Attr WILD
 
 contract: Let Ident COLON Constr Type
 ##
-## Ends in an error in state: 374.
+## Ends in an error in state: 376.
 ##
 ## let_binding -> Ident option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2927,7 +2927,7 @@ contract: Let Ident COLON Constr Type
 
 contract: Let Ident EQ WILD
 ##
-## Ends in an error in state: 375.
+## Ends in an error in state: 377.
 ##
 ## let_binding -> Ident option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -2944,7 +2944,7 @@ let func = (a: int, b: int) => a + b;
 
 contract: Let Ident WILD
 ##
-## Ends in an error in state: 373.
+## Ends in an error in state: 375.
 ##
 ## let_binding -> Ident . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> Ident . [ COMMA ]
@@ -2957,7 +2957,7 @@ contract: Let Ident WILD
 
 contract: Let LBRACE Ident EQ Bytes COMMA Ident EQ Bytes COMMA WILD
 ##
-## Ends in an error in state: 309.
+## Ends in an error in state: 311.
 ##
 ## nsepseq(field_pattern,COMMA) -> field_pattern COMMA . nsepseq(field_pattern,COMMA) [ RBRACE ]
 ## seq(__anonymous_0(field_pattern,COMMA)) -> field_pattern COMMA . seq(__anonymous_0(field_pattern,COMMA)) [ RBRACE ]
@@ -2970,7 +2970,7 @@ contract: Let LBRACE Ident EQ Bytes COMMA Ident EQ Bytes COMMA WILD
 
 contract: Let LBRACE Ident EQ Bytes COMMA Ident EQ Bytes WILD
 ##
-## Ends in an error in state: 308.
+## Ends in an error in state: 310.
 ##
 ## nsepseq(field_pattern,COMMA) -> field_pattern . [ RBRACE ]
 ## nsepseq(field_pattern,COMMA) -> field_pattern . COMMA nsepseq(field_pattern,COMMA) [ RBRACE ]
@@ -2984,7 +2984,7 @@ contract: Let LBRACE Ident EQ Bytes COMMA Ident EQ Bytes WILD
 
 contract: Let LBRACE Ident EQ Bytes COMMA WILD
 ##
-## Ends in an error in state: 305.
+## Ends in an error in state: 307.
 ##
 ## nsepseq(field_pattern,COMMA) -> field_pattern COMMA . nsepseq(field_pattern,COMMA) [ RBRACE ]
 ## nseq(__anonymous_0(field_pattern,COMMA)) -> field_pattern COMMA . seq(__anonymous_0(field_pattern,COMMA)) [ RBRACE ]
@@ -2997,7 +2997,7 @@ contract: Let LBRACE Ident EQ Bytes COMMA WILD
 
 contract: Let LBRACE Ident EQ Bytes RBRACE COLON Constr Type
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 389.
 ##
 ## let_binding -> record_pattern option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3020,7 +3020,7 @@ contract: Let LBRACE Ident EQ Bytes RBRACE COLON Constr Type
 
 contract: Let LBRACE Ident EQ Bytes RBRACE EQ WILD
 ##
-## Ends in an error in state: 388.
+## Ends in an error in state: 390.
 ##
 ## let_binding -> record_pattern option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3032,7 +3032,7 @@ contract: Let LBRACE Ident EQ Bytes RBRACE EQ WILD
 
 contract: Let LBRACE Ident EQ Bytes RBRACE WILD
 ##
-## Ends in an error in state: 386.
+## Ends in an error in state: 388.
 ##
 ## let_binding -> record_pattern . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> record_pattern . [ COMMA ]
@@ -3045,7 +3045,7 @@ contract: Let LBRACE Ident EQ Bytes RBRACE WILD
 
 contract: Let LBRACE Ident EQ Bytes WILD
 ##
-## Ends in an error in state: 304.
+## Ends in an error in state: 306.
 ##
 ## nsepseq(field_pattern,COMMA) -> field_pattern . [ RBRACE ]
 ## nsepseq(field_pattern,COMMA) -> field_pattern . COMMA nsepseq(field_pattern,COMMA) [ RBRACE ]
@@ -3059,7 +3059,7 @@ contract: Let LBRACE Ident EQ Bytes WILD
 
 contract: Let LBRACE Ident EQ VBAR
 ##
-## Ends in an error in state: 282.
+## Ends in an error in state: 284.
 ##
 ## field_pattern -> Ident EQ . sub_pattern [ RBRACE COMMA ]
 ##
@@ -3071,7 +3071,7 @@ contract: Let LBRACE Ident EQ VBAR
 
 contract: Let LBRACE Ident WILD
 ##
-## Ends in an error in state: 281.
+## Ends in an error in state: 283.
 ##
 ## field_pattern -> Ident . EQ sub_pattern [ RBRACE COMMA ]
 ##
@@ -3083,7 +3083,7 @@ contract: Let LBRACE Ident WILD
 
 contract: Let LBRACE WILD
 ##
-## Ends in an error in state: 280.
+## Ends in an error in state: 282.
 ##
 ## record_pattern -> LBRACE . sep_or_term_list(field_pattern,COMMA) RBRACE [ SEMI RPAR RBRACKET RBRACE EQ COMMA COLON ARROW ]
 ##
@@ -3095,7 +3095,7 @@ contract: Let LBRACE WILD
 
 contract: Let LPAR C_Some VBAR
 ##
-## Ends in an error in state: 287.
+## Ends in an error in state: 289.
 ##
 ## constr_pattern -> C_Some . sub_pattern [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ##
@@ -3107,7 +3107,7 @@ contract: Let LPAR C_Some VBAR
 
 contract: Let LPAR Constr LBRACKET VBAR
 ##
-## Ends in an error in state: 279.
+## Ends in an error in state: 281.
 ##
 ## list__(sub_pattern) -> LBRACKET . option(sep_or_term_list(sub_pattern,SEMI)) RBRACKET [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ##
@@ -3119,7 +3119,7 @@ contract: Let LPAR Constr LBRACKET VBAR
 
 contract: Let LPAR Constr LBRACKET WILD SEMI VBAR
 ##
-## Ends in an error in state: 312.
+## Ends in an error in state: 314.
 ##
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern SEMI . nsepseq(sub_pattern,SEMI) [ RBRACKET ]
 ## nseq(__anonymous_0(sub_pattern,SEMI)) -> sub_pattern SEMI . seq(__anonymous_0(sub_pattern,SEMI)) [ RBRACKET ]
@@ -3132,7 +3132,7 @@ contract: Let LPAR Constr LBRACKET WILD SEMI VBAR
 
 contract: Let LPAR Constr LBRACKET WILD SEMI WILD SEMI VBAR
 ##
-## Ends in an error in state: 314.
+## Ends in an error in state: 316.
 ##
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern SEMI . nsepseq(sub_pattern,SEMI) [ RBRACKET ]
 ## seq(__anonymous_0(sub_pattern,SEMI)) -> sub_pattern SEMI . seq(__anonymous_0(sub_pattern,SEMI)) [ RBRACKET ]
@@ -3145,7 +3145,7 @@ contract: Let LPAR Constr LBRACKET WILD SEMI WILD SEMI VBAR
 
 contract: Let LPAR Constr LBRACKET WILD SEMI WILD WILD
 ##
-## Ends in an error in state: 313.
+## Ends in an error in state: 315.
 ##
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . [ RBRACKET ]
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . SEMI nsepseq(sub_pattern,SEMI) [ RBRACKET ]
@@ -3159,7 +3159,7 @@ contract: Let LPAR Constr LBRACKET WILD SEMI WILD WILD
 
 contract: Let LPAR Constr LBRACKET WILD WILD
 ##
-## Ends in an error in state: 311.
+## Ends in an error in state: 313.
 ##
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . [ RBRACKET ]
 ## nsepseq(sub_pattern,SEMI) -> sub_pattern . SEMI nsepseq(sub_pattern,SEMI) [ RBRACKET ]
@@ -3173,7 +3173,7 @@ contract: Let LPAR Constr LBRACKET WILD WILD
 
 contract: Let LPAR Constr LPAR VBAR
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 280.
 ##
 ## par(ptuple) -> LPAR . ptuple RPAR [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ## par(sub_pattern) -> LPAR . sub_pattern RPAR [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
@@ -3187,7 +3187,7 @@ contract: Let LPAR Constr LPAR VBAR
 
 contract: Let LPAR Constr LPAR WILD COMMA Bytes ARROW
 ##
-## Ends in an error in state: 331.
+## Ends in an error in state: 333.
 ##
 ## par(ptuple) -> LPAR ptuple . RPAR [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ##
@@ -3198,16 +3198,16 @@ contract: Let LPAR Constr LPAR WILD COMMA Bytes ARROW
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 327, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
-## In state 330, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
-## In state 323, spurious reduction of production ptuple -> tuple(sub_pattern) 
+## In state 329, spurious reduction of production nsepseq(sub_pattern,COMMA) -> sub_pattern 
+## In state 332, spurious reduction of production tuple(sub_pattern) -> sub_pattern COMMA nsepseq(sub_pattern,COMMA) 
+## In state 325, spurious reduction of production ptuple -> tuple(sub_pattern) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr LPAR WILD WILD
 ##
-## Ends in an error in state: 324.
+## Ends in an error in state: 326.
 ##
 ## par(sub_pattern) -> LPAR sub_pattern . RPAR [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ## tuple(sub_pattern) -> sub_pattern . COMMA nsepseq(sub_pattern,COMMA) [ RPAR ]
@@ -3220,7 +3220,7 @@ contract: Let LPAR Constr LPAR WILD WILD
 
 contract: Let LPAR Constr SEMI
 ##
-## Ends in an error in state: 371.
+## Ends in an error in state: 373.
 ##
 ## par(closed_irrefutable) -> LPAR closed_irrefutable . RPAR [ RPAR EQ COMMA COLON ]
 ##
@@ -3231,15 +3231,15 @@ contract: Let LPAR Constr SEMI
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 286, spurious reduction of production constr_pattern -> Constr 
-## In state 370, spurious reduction of production closed_irrefutable -> constr_pattern 
+## In state 288, spurious reduction of production constr_pattern -> Constr 
+## In state 372, spurious reduction of production closed_irrefutable -> constr_pattern 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR Constr VBAR
 ##
-## Ends in an error in state: 286.
+## Ends in an error in state: 288.
 ##
 ## constr_pattern -> Constr . sub_pattern [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
 ## constr_pattern -> Constr . [ SEMI RPAR RBRACKET RBRACE COMMA ARROW ]
@@ -3252,7 +3252,7 @@ contract: Let LPAR Constr VBAR
 
 contract: Let LPAR RPAR COLON Constr Type
 ##
-## Ends in an error in state: 378.
+## Ends in an error in state: 380.
 ##
 ## let_binding -> unit option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3275,7 +3275,7 @@ contract: Let LPAR RPAR COLON Constr Type
 
 contract: Let LPAR RPAR EQ WILD
 ##
-## Ends in an error in state: 379.
+## Ends in an error in state: 381.
 ##
 ## let_binding -> unit option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3287,7 +3287,7 @@ contract: Let LPAR RPAR EQ WILD
 
 contract: Let LPAR RPAR WILD
 ##
-## Ends in an error in state: 377.
+## Ends in an error in state: 379.
 ##
 ## let_binding -> unit . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> unit . [ COMMA ]
@@ -3300,7 +3300,7 @@ contract: Let LPAR RPAR WILD
 
 contract: Let LPAR VBAR
 ##
-## Ends in an error in state: 353.
+## Ends in an error in state: 355.
 ##
 ## par(closed_irrefutable) -> LPAR . closed_irrefutable RPAR [ RPAR EQ COMMA COLON ]
 ## unit -> LPAR . RPAR [ RPAR EQ COMMA COLON ]
@@ -3313,7 +3313,7 @@ contract: Let LPAR VBAR
 
 contract: Let LPAR WILD COLON WILD
 ##
-## Ends in an error in state: 368.
+## Ends in an error in state: 370.
 ##
 ## typed_pattern -> irrefutable COLON . type_expr [ RPAR ]
 ##
@@ -3325,7 +3325,7 @@ contract: Let LPAR WILD COLON WILD
 
 contract: Let LPAR WILD COMMA Ident EQ
 ##
-## Ends in an error in state: 367.
+## Ends in an error in state: 369.
 ##
 ## closed_irrefutable -> irrefutable . [ RPAR ]
 ## typed_pattern -> irrefutable . COLON type_expr [ RPAR ]
@@ -3337,16 +3337,16 @@ contract: Let LPAR WILD COMMA Ident EQ
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 361, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
-## In state 366, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
-## In state 358, spurious reduction of production irrefutable -> tuple(sub_irrefutable) 
+## In state 363, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
+## In state 368, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
+## In state 360, spurious reduction of production irrefutable -> tuple(sub_irrefutable) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let LPAR WILD RPAR COLON Constr Type
 ##
-## Ends in an error in state: 391.
+## Ends in an error in state: 393.
 ##
 ## let_binding -> par(closed_irrefutable) option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3369,7 +3369,7 @@ contract: Let LPAR WILD RPAR COLON Constr Type
 
 contract: Let LPAR WILD RPAR EQ WILD
 ##
-## Ends in an error in state: 392.
+## Ends in an error in state: 394.
 ##
 ## let_binding -> par(closed_irrefutable) option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3381,7 +3381,7 @@ contract: Let LPAR WILD RPAR EQ WILD
 
 contract: Let LPAR WILD RPAR WILD
 ##
-## Ends in an error in state: 390.
+## Ends in an error in state: 392.
 ##
 ## let_binding -> par(closed_irrefutable) . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ## sub_irrefutable -> par(closed_irrefutable) . [ COMMA ]
@@ -3394,7 +3394,7 @@ contract: Let LPAR WILD RPAR WILD
 
 contract: Let LPAR WILD WILD
 ##
-## Ends in an error in state: 359.
+## Ends in an error in state: 361.
 ##
 ## irrefutable -> sub_irrefutable . [ RPAR COLON ]
 ## tuple(sub_irrefutable) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ RPAR COLON ]
@@ -3405,11 +3405,24 @@ contract: Let LPAR WILD WILD
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
+contract: Let Rec VBAR
+##
+## Ends in an error in state: 533.
+##
+## let_declaration -> seq(Attr) Let Rec . let_binding [ Type SEMI Let EOF Attr ]
+##
+## The known suffix of the stack is as follows:
+## seq(Attr) Let Rec
+##
+
+<YOUR SYNTAX ERROR MESSAGE HERE>
+
 contract: Let VBAR
 ##
 ## Ends in an error in state: 75.
 ##
 ## let_declaration -> seq(Attr) Let . let_binding [ Type SEMI Let EOF Attr ]
+## let_declaration -> seq(Attr) Let . Rec let_binding [ Type SEMI Let EOF Attr ]
 ##
 ## The known suffix of the stack is as follows:
 ## seq(Attr) Let
@@ -3453,7 +3466,7 @@ contract: Let WILD COLON WILD
 
 contract: Let WILD COMMA Ident COLON Constr Type
 ##
-## Ends in an error in state: 382.
+## Ends in an error in state: 384.
 ##
 ## let_binding -> tuple(sub_irrefutable) option(type_annotation) . EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3476,7 +3489,7 @@ contract: Let WILD COMMA Ident COLON Constr Type
 
 contract: Let WILD COMMA Ident EQ WILD
 ##
-## Ends in an error in state: 383.
+## Ends in an error in state: 385.
 ##
 ## let_binding -> tuple(sub_irrefutable) option(type_annotation) EQ . expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3488,7 +3501,7 @@ contract: Let WILD COMMA Ident EQ WILD
 
 contract: Let WILD COMMA Ident RPAR
 ##
-## Ends in an error in state: 381.
+## Ends in an error in state: 383.
 ##
 ## let_binding -> tuple(sub_irrefutable) . option(type_annotation) EQ expr [ Type SEMI Let EOF Attr ]
 ##
@@ -3499,15 +3512,15 @@ contract: Let WILD COMMA Ident RPAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 361, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
-## In state 366, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
+## In state 363, spurious reduction of production nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable 
+## In state 368, spurious reduction of production tuple(sub_irrefutable) -> sub_irrefutable COMMA nsepseq(sub_irrefutable,COMMA) 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
 
 contract: Let WILD COMMA VBAR
 ##
-## Ends in an error in state: 360.
+## Ends in an error in state: 362.
 ##
 ## tuple(sub_irrefutable) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
 ##
@@ -3519,7 +3532,7 @@ contract: Let WILD COMMA VBAR
 
 contract: Let WILD COMMA WILD COMMA VBAR
 ##
-## Ends in an error in state: 362.
+## Ends in an error in state: 364.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable COMMA . nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
 ##
@@ -3531,7 +3544,7 @@ contract: Let WILD COMMA WILD COMMA VBAR
 
 contract: Let WILD COMMA WILD WILD
 ##
-## Ends in an error in state: 361.
+## Ends in an error in state: 363.
 ##
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . [ RPAR EQ COLON ]
 ## nsepseq(sub_irrefutable,COMMA) -> sub_irrefutable . COMMA nsepseq(sub_irrefutable,COMMA) [ RPAR EQ COLON ]
@@ -3544,7 +3557,7 @@ contract: Let WILD COMMA WILD WILD
 
 contract: Let WILD EQ Bytes VBAR
 ##
-## Ends in an error in state: 532.
+## Ends in an error in state: 536.
 ##
 ## declaration -> let_declaration . option(SEMI) [ Type Let EOF Attr ]
 ##
@@ -3555,21 +3568,21 @@ contract: Let WILD EQ Bytes VBAR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 152, spurious reduction of production call_expr_level_in -> core_expr 
-## In state 170, spurious reduction of production option(type_annotation_simple) -> 
-## In state 171, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
-## In state 172, spurious reduction of production unary_expr_level -> call_expr_level 
-## In state 125, spurious reduction of production mult_expr_level -> unary_expr_level 
-## In state 149, spurious reduction of production add_expr_level -> mult_expr_level 
-## In state 180, spurious reduction of production cat_expr_level -> add_expr_level 
-## In state 201, spurious reduction of production comp_expr_level -> cat_expr_level 
-## In state 208, spurious reduction of production conj_expr_level -> comp_expr_level 
-## In state 215, spurious reduction of production disj_expr_level -> conj_expr_level 
-## In state 162, spurious reduction of production base_expr(expr) -> disj_expr_level 
-## In state 219, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
-## In state 220, spurious reduction of production expr -> base_cond__open(expr) 
-## In state 530, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
-## In state 531, spurious reduction of production let_declaration -> seq(Attr) Let let_binding 
+## In state 154, spurious reduction of production call_expr_level_in -> core_expr 
+## In state 172, spurious reduction of production option(type_annotation_simple) -> 
+## In state 173, spurious reduction of production call_expr_level -> call_expr_level_in option(type_annotation_simple) 
+## In state 174, spurious reduction of production unary_expr_level -> call_expr_level 
+## In state 127, spurious reduction of production mult_expr_level -> unary_expr_level 
+## In state 151, spurious reduction of production add_expr_level -> mult_expr_level 
+## In state 182, spurious reduction of production cat_expr_level -> add_expr_level 
+## In state 203, spurious reduction of production comp_expr_level -> cat_expr_level 
+## In state 210, spurious reduction of production conj_expr_level -> comp_expr_level 
+## In state 217, spurious reduction of production disj_expr_level -> conj_expr_level 
+## In state 164, spurious reduction of production base_expr(expr) -> disj_expr_level 
+## In state 221, spurious reduction of production base_cond__open(expr) -> base_expr(expr) 
+## In state 222, spurious reduction of production expr -> base_cond__open(expr) 
+## In state 532, spurious reduction of production let_binding -> WILD option(type_annotation) EQ expr 
+## In state 535, spurious reduction of production let_declaration -> seq(Attr) Let let_binding 
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
@@ -3679,7 +3692,7 @@ contract: Type Ident EQ Constr RPAR
 
 contract: Type Ident EQ Constr SEMI WILD
 ##
-## Ends in an error in state: 536.
+## Ends in an error in state: 540.
 ##
 ## declarations -> declaration . [ EOF ]
 ## declarations -> declaration . declarations [ EOF ]
@@ -4128,3 +4141,4 @@ contract: WILD
 ##
 
 <YOUR SYNTAX ERROR MESSAGE HERE>
+

From 51251f946452407e5e948540d075468b32f81bdc Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Tue, 10 Mar 2020 10:52:07 +0100
Subject: [PATCH 21/43] Remove debug text

---
 src/passes/1-parser/pascaligo.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/passes/1-parser/pascaligo.ml b/src/passes/1-parser/pascaligo.ml
index cbbe2014c..8f0644cf7 100644
--- a/src/passes/1-parser/pascaligo.ml
+++ b/src/passes/1-parser/pascaligo.ml
@@ -50,7 +50,7 @@ module Errors =
            fun () -> Format.asprintf "%a" Location.pp_lift @@ loc)] *)
 
     let generic message =
-      let title () = "scofzpfj%!"
+      let title () = ""
       and message () = message.Region.value
       in Trace.error ~data:[] title message
   end

From a5f44d3e88c0a47a67131f353b1b97fee8a1dd9f Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 9 Mar 2020 22:53:15 +0100
Subject: [PATCH 22/43] clean-up junk

---
 src/bin/expect_tests/contract_tests.ml |  4 ++--
 src/passes/1-parser/pascaligo.ml       |  6 +-----
 src/passes/2-simplify/cameligo.ml      |  4 ++--
 src/passes/6-transpiler/transpiler.ml  |  1 -
 src/passes/operators/operators.ml      | 19 +++----------------
 src/test/parser_negative_tests.ml      |  9 +--------
 6 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index de2524afe..1bb5d7969 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#809 = #P in let p = rhs#809.0 in let s = rhs#809.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#808 = #P in let p = rhs#808.0 in let s = rhs#808.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#812 = #P in let p = rhs#812.0 in let s = rhs#812.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
diff --git a/src/passes/1-parser/pascaligo.ml b/src/passes/1-parser/pascaligo.ml
index 8f0644cf7..10eeaa30d 100644
--- a/src/passes/1-parser/pascaligo.ml
+++ b/src/passes/1-parser/pascaligo.ml
@@ -182,14 +182,10 @@ let parse_expression (s: string) =
       let ext = PreIO.ext
       let options = PreIO.pre_options ~input:None ~expr:true
     end in
-  Format.printf "coucou : %s\n%!" s;
   let module Unit = PreUnit (IO) in
   match Lexer.(open_token_stream @@ String s) with
     Ok instance ->
       let thunk () = Unit.apply instance Unit.parse_expr
-      in 
-  Format.printf "ok\n%!";
-      parse (module IO) thunk
+      in parse (module IO) thunk
   | Stdlib.Error (Lexer.File_opening msg) ->
-  Format.printf "fail\n%!";
       Trace.fail @@ Errors.generic @@ Region.wrap_ghost msg
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index 0895c5323..27f661110 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -847,11 +847,11 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
           in ok @@ decls
         | PPar {region = _ ; value = { lpar = _ ; inside = pt; rpar = _; } } ->
           (* Extract parenthetical multi-bind *)
-          let (wild, _rec, _, attributes) = fst @@ r_split x in
+          let (wild, recursive, _, attributes) = fst @@ r_split x in
           simpl_declaration
             (Let {
                 region = x.region;
-                value = (wild, _rec, {binders = (pt, []);
+                value = (wild, recursive, {binders = (pt, []);
                                 lhs_type = lhs_type;
                                 eq = Region.ghost ;
                                 let_rhs = let_rhs}, attributes)}
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/6-transpiler/transpiler.ml
index 9b2d3308d..bb959bcd5 100644
--- a/src/passes/6-transpiler/transpiler.ml
+++ b/src/passes/6-transpiler/transpiler.ml
@@ -642,7 +642,6 @@ and transpile_recursive {fun_name; fun_type; lambda} =
   let loop_type = t_union (None, input_type) (None, output_type) in
   let%bind (body,binder) = map_lambda fun_name loop_type lambda.result in
   let binder = lambda.binder::binder in
-  List.iter (Format.printf "inder %a\n%!" Var.pp) binder ;
   let%bind binder = match binder with hd::[] -> ok @@ hd | _ -> fail @@ unsupported_recursive_function fun_name in
   let expr = Expression.make_tpl (E_variable binder, input_type) in
   let body = Expression.make (E_iterator (C_LOOP_LEFT, ((lambda.binder, loop_type),body), expr)) output_type in
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index 9815ec83f..7d2807b44 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -349,8 +349,7 @@ module Simplify = struct
 
     (* Loop module *)
 
-    | "Loop.fold_while" -> ok C_FOLD_WHILE
-    | "Loop.loop_left"  -> ok C_LOOP_LEFT
+    | "Loop.fold_while" -> ok C_FOLD_WHILE    (* Deprecated *)
     | "Loop.resume"     -> ok C_FOLD_CONTINUE
     | "continue"        -> ok C_FOLD_CONTINUE (* Deprecated *)
     | "Loop.stop"       -> ok C_FOLD_STOP
@@ -485,7 +484,6 @@ module Typer = struct
 
     let t_continuation = forall "a" @@ fun a -> tuple2 bool a --> pair bool a
     let t_fold_while   = forall "a" @@ fun a -> tuple2 (a --> pair bool a) a --> a
-    let t_loop_left    = forall2 "a" "b" @@ fun a b -> tuple2 (a --> sum a b) a --> b
     let t_neg          = tuple1 int --> int
     let t_and          = tuple2 bool bool --> bool
     let t_or           = tuple2 bool bool --> bool
@@ -517,9 +515,8 @@ module Typer = struct
       | C_FAILWITH            -> ok @@ t_failwith ;
       (* LOOPS *)
       | C_FOLD_WHILE          -> ok @@ t_fold_while ;
-      | C_LOOP_LEFT           -> ok @@ t_loop_left;
-      | C_FOLD_CONTINUE            -> ok @@ t_continuation ;
-      | C_FOLD_STOP                -> ok @@ t_continuation ;
+      | C_FOLD_CONTINUE       -> ok @@ t_continuation ;
+      | C_FOLD_STOP           -> ok @@ t_continuation ;
       (* MATH *)
       | C_NEG                 -> ok @@ t_neg ;
       | C_ABS                 -> ok @@ t_abs ;
@@ -1021,15 +1018,6 @@ module Typer = struct
     let%bind () = assert_eq_1 (t_pair (t_bool ()) init ()) result
     in ok init
 
-  let loop_left = typer_2 "LOOP_LEFT" @@ fun _body _init ->
-    failwith ("should not be used before mini-c")
-    (* 
-    let%bind (arg, result) = get_t_function body in
-    let%bind () = assert_eq_1 arg init in
-    let%bind () = assert_eq_1 arg result in (* Right now, only able to compile when both types are equals *)
-    ok result
-  *)
-
   (* Continue and Stop are just syntactic sugar for building a pair (bool * a') *)
   let continue = typer_1 "CONTINUE" @@ fun arg ->
     ok @@ t_pair (t_bool ()) arg ()
@@ -1127,7 +1115,6 @@ module Typer = struct
     | C_FAILWITH            -> ok @@ failwith_ ;
     (* LOOPS *)
     | C_FOLD_WHILE          -> ok @@ fold_while ;
-    | C_LOOP_LEFT           -> ok @@ loop_left;
     | C_FOLD_CONTINUE       -> ok @@ continue ;
     | C_FOLD_STOP           -> ok @@ stop ;
      (* MATH *)
diff --git a/src/test/parser_negative_tests.ml b/src/test/parser_negative_tests.ml
index 6f0a32743..038bca7f7 100644
--- a/src/test/parser_negative_tests.ml
+++ b/src/test/parser_negative_tests.ml
@@ -13,7 +13,6 @@ let reasonligo_sdata = {
   parser = Parser.Reasonligo.parse_expression }
 
 let get_exp_as_string filename =
-  Format.printf "Get file\n%!";
   let lines = ref [] in
   let chan = open_in filename in
   try
@@ -22,17 +21,11 @@ let get_exp_as_string filename =
     done; !lines
   with End_of_file ->
     close_in chan;
-  Format.printf "End file\n%!";
     List.rev !lines ;;
 
 let assert_syntax_error sdata () =
-  Format.printf "ASsert\n%!";
-  let n = ref 0 in
   let%bind _l = bind_iter_list
-    (fun entry -> 
-      n := !n+1;
-      Format.printf "Line %d : %s\n%!" !n entry;
-      Assert.assert_fail @@ sdata.parser entry)
+    (fun entry -> Assert.assert_fail @@ sdata.parser entry)
     (get_exp_as_string sdata.erroneous_source_file) in
   ok ()
 

From abbc20459cac879cc888e672d165462448665c2f Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Tue, 10 Mar 2020 14:24:57 +0100
Subject: [PATCH 23/43] add doc and test

---
 .../docs/language-basics/functions.md         | 40 +++++++++++++++++
 src/test/contracts/recursion.ligo             |  7 ++-
 src/test/contracts/recursion.mligo            |  8 ++--
 src/test/contracts/recursion.religo           |  8 ++--
 src/test/integration_tests.ml                 | 43 +++++++++++++------
 5 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/gitlab-pages/docs/language-basics/functions.md b/gitlab-pages/docs/language-basics/functions.md
index eadc1c31e..54f0d82fd 100644
--- a/gitlab-pages/docs/language-basics/functions.md
+++ b/gitlab-pages/docs/language-basics/functions.md
@@ -299,3 +299,43 @@ gitlab-pages/docs/language-basics/src/functions/incr_map.religo incr_map
 
 </Syntax>
 
+## Recursive function
+
+LIGO function are not recursive by default, the user need to indicate that the function is recursive.
+
+At the moment, recursive function are limited to one (possibly tupled) parameter and recursion is
+limited to tail recursion (i.e the recursive call should be the last expression of the function)
+
+<Syntax syntax="pascaligo">
+In PascaLigo recursive funciton are defined using the "recursive" keyword
+
+```pascaligo group=d
+recursive function sum (const n : int; const acc: int) : int is
+  if n<1 then acc else sum(n-1,acc+n)
+
+recursive function fibo (const n: int; const n_1: int; const n_0 :int) : int is
+  if n<2 then n_1 else fibo(n-1,n_1+n_0,n_1)
+```
+</Syntax>
+<Syntax syntax="cameligo">
+In CameLigo recursive funciton are defined using the "rec" keyword
+
+```cameligo group=d
+let rec sum ((n,acc):int * int) : int =
+    if (n < 1) then acc else sum (n-1, acc+n)
+ 
+let rec fibo ((n,n_1,n_0):int*int*int) : int = 
+    if (n < 2) then n_1 else fibo (n-1, n_1 + n_0, n_1)
+```
+</Syntax>
+<Syntax syntax="reasonligo">
+In ReasonLigo recursive funciton are defined using the "rec" keyword
+
+```reasonligo group=d
+let rec sum = ((n, acc) : (int,int)): int =>
+    if (n < 1) {acc;} else {sum ((n-1,acc+n));};
+
+let rec fibo = ((n, n_1, n_0) : (int,int,int)): int =>
+    if (n < 2) {n_1;} else {fibo ((n-1,n_1+n_0,n_1));};
+```
+</Syntax>
diff --git a/src/test/contracts/recursion.ligo b/src/test/contracts/recursion.ligo
index 894993eac..3c8bcd7cb 100644
--- a/src/test/contracts/recursion.ligo
+++ b/src/test/contracts/recursion.ligo
@@ -1,4 +1,7 @@
 // Test while loops in PascaLIGO
 
-recursive function fibo (const n : int; const acc: int) : int is
-  if n<1 then acc else fibo(n-1,acc+n)
+recursive function sum (const n : int; const acc: int) : int is
+  if n<1 then acc else sum(n-1,acc+n)
+
+recursive function fibo (const n: int; const n_1: int; const n_0 :int) : int is
+  if n<2 then n_1 else fibo(n-1,n_1+n_0,n_1)
diff --git a/src/test/contracts/recursion.mligo b/src/test/contracts/recursion.mligo
index 13e86518b..79549b5ee 100644
--- a/src/test/contracts/recursion.mligo
+++ b/src/test/contracts/recursion.mligo
@@ -1,5 +1,7 @@
 // Test while loops in PascaLIGO
 
-let rec fibo ((n,acc):int * int) : int =
-    if (n < 1) then acc
-    else fibo (n-1, acc+n)
+let rec sum ((n,acc):int * int) : int =
+    if (n < 1) then acc else sum (n-1, acc+n)
+ 
+let rec fibo ((n,n_1,n_0):int*int*int) : int = 
+    if (n < 2) then n_1 else fibo (n-1, n_1 + n_0, n_1)
diff --git a/src/test/contracts/recursion.religo b/src/test/contracts/recursion.religo
index 71f016962..7a9d5063a 100644
--- a/src/test/contracts/recursion.religo
+++ b/src/test/contracts/recursion.religo
@@ -1,5 +1,7 @@
 // Test while loops in PascaLIGO
 
-let rec fibo = ((n, acc) : (int,int)): int =>
-    if (n < 1) {acc;}
-    else {fibo ((n-1,acc+n));};
+let rec sum = ((n, acc) : (int,int)): int =>
+    if (n < 1) {acc;} else {sum ((n-1,acc+n));};
+
+let rec fibo = ((n, n_1, n_0) : (int,int,int)): int =>
+    if (n < 2) {n_1;} else {fibo ((n-1,n_1+n_0,n_1));};
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 60b8f57bb..9c17f2479 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -1495,24 +1495,43 @@ let assert_religo () : unit result =
 
 let recursion_ligo () : unit result =
   let%bind program = type_file "./contracts/recursion.ligo" in
-  let make_input = e_pair (e_int 10) (e_int 0) in
-  let make_expected = e_int 55 in
-  let%bind _ = expect_eq program "fibo" make_input make_expected in
-  ok ()
+  let%bind _ =
+    let make_input = e_pair (e_int 10) (e_int 0) in
+    let make_expected = e_int 55 in
+    expect_eq program "sum" make_input make_expected 
+  in
+  let%bind _ =
+    let make_input = e_tuple [(e_int 10); (e_int 1); (e_int 1)] in
+    let make_expected = e_int 89 in
+    expect_eq program "fibo" make_input make_expected
+  in ok ()
+  
 
 let recursion_mligo () : unit result =
   let%bind program = mtype_file "./contracts/recursion.mligo" in
-  let make_input = e_pair (e_int 10) (e_int 0) in
-  let make_expected = e_int 55 in
-  let%bind _ = expect_eq program "fibo" make_input make_expected in
-  ok ()
+  let%bind _ =
+    let make_input = e_pair (e_int 10) (e_int 0) in
+    let make_expected = e_int 55 in
+    expect_eq program "sum" make_input make_expected 
+  in
+  let%bind _ =
+    let make_input = e_tuple [(e_int 10); (e_int 1); (e_int 1)] in
+    let make_expected = e_int 89 in
+    expect_eq program "fibo" make_input make_expected
+  in ok ()
 
 let recursion_religo () : unit result =
   let%bind program = retype_file "./contracts/recursion.religo" in
-  let make_input = e_pair (e_int 10) (e_int 0) in
-  let make_expected = e_int 55 in
-  let%bind _ = expect_eq program "fibo" make_input make_expected in
-  ok ()
+  let%bind _ =
+    let make_input = e_pair (e_int 10) (e_int 0) in
+    let make_expected = e_int 55 in
+    expect_eq program "sum" make_input make_expected 
+  in
+  let%bind _ =
+    let make_input = e_tuple [(e_int 10); (e_int 1); (e_int 1)] in
+    let make_expected = e_int 89 in
+    expect_eq program "fibo" make_input make_expected
+  in ok ()
 
 let guess_string_mligo () : unit result =
   let%bind program = type_file "./contracts/guess_string.mligo" in

From dbb6fbd8e6b2bab865680a66ccc5c2d4f6fc68e2 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Wed, 11 Mar 2020 11:18:39 +0100
Subject: [PATCH 24/43] review 1

---
 gitlab-pages/docs/language-basics/functions.md | 8 ++++----
 src/passes/1-parser/cameligo/Parser.mly        | 2 +-
 src/passes/1-parser/reasonligo/Parser.mly      | 2 +-
 src/passes/2-simplify/cameligo.ml              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gitlab-pages/docs/language-basics/functions.md b/gitlab-pages/docs/language-basics/functions.md
index 54f0d82fd..18173b545 100644
--- a/gitlab-pages/docs/language-basics/functions.md
+++ b/gitlab-pages/docs/language-basics/functions.md
@@ -301,13 +301,13 @@ gitlab-pages/docs/language-basics/src/functions/incr_map.religo incr_map
 
 ## Recursive function
 
-LIGO function are not recursive by default, the user need to indicate that the function is recursive.
+LIGO functions are not recursive by default, the user need to indicate that the function is recursive.
 
 At the moment, recursive function are limited to one (possibly tupled) parameter and recursion is
 limited to tail recursion (i.e the recursive call should be the last expression of the function)
 
 <Syntax syntax="pascaligo">
-In PascaLigo recursive funciton are defined using the "recursive" keyword
+In PascaLigo recursive functions are defined using the "recursive" keyword
 
 ```pascaligo group=d
 recursive function sum (const n : int; const acc: int) : int is
@@ -318,7 +318,7 @@ recursive function fibo (const n: int; const n_1: int; const n_0 :int) : int is
 ```
 </Syntax>
 <Syntax syntax="cameligo">
-In CameLigo recursive funciton are defined using the "rec" keyword
+In CameLigo recursive functions are defined using the "rec" keyword
 
 ```cameligo group=d
 let rec sum ((n,acc):int * int) : int =
@@ -329,7 +329,7 @@ let rec fibo ((n,n_1,n_0):int*int*int) : int =
 ```
 </Syntax>
 <Syntax syntax="reasonligo">
-In ReasonLigo recursive funciton are defined using the "rec" keyword
+In ReasonLigo recursive functions are defined using the "rec" keyword
 
 ```reasonligo group=d
 let rec sum = ((n, acc) : (int,int)): int =>
diff --git a/src/passes/1-parser/cameligo/Parser.mly b/src/passes/1-parser/cameligo/Parser.mly
index 38c62e50a..237c08875 100644
--- a/src/passes/1-parser/cameligo/Parser.mly
+++ b/src/passes/1-parser/cameligo/Parser.mly
@@ -203,7 +203,7 @@ field_decl:
     and value  = {field_name=$1; colon=$2; field_type=$3}
     in {region; value} }
 
-(* Top-level non-eecursive definitions *)
+(* Top-level definitions *)
 
 let_declaration:
   "let" ioption("rec") let_binding seq(Attr) {
diff --git a/src/passes/1-parser/reasonligo/Parser.mly b/src/passes/1-parser/reasonligo/Parser.mly
index 6ab0464ac..f487e306e 100644
--- a/src/passes/1-parser/reasonligo/Parser.mly
+++ b/src/passes/1-parser/reasonligo/Parser.mly
@@ -261,7 +261,7 @@ field_decl:
     and value  = {field_name=$1; colon=$2; field_type=$3}
     in {region; value} }
 
-(* Top-level non-recursive definitions *)
+(* Top-level definitions *)
 
 let_declaration:
   seq(Attr) "let" ioption("rec") let_binding {
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-simplify/cameligo.ml
index 27f661110..4e82b9d11 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-simplify/cameligo.ml
@@ -73,7 +73,7 @@ module Errors = struct
   let untyped_recursive_function var =
     let title () = "" in
     let message () =
-      Format.asprintf "\nUntyped recursive function \
+      Format.asprintf "\nUntyped recursive functions \
                        are not supported yet.\n" in
     let param_loc = var.Region.region in
     let data = [

From c17a749078047992e8cb2cb529494cc62e5f7f1e Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Wed, 11 Mar 2020 17:04:49 +0100
Subject: [PATCH 25/43] review 2

---
 .../docs/language-basics/functions.md         |  6 +-
 src/passes/2-simplify/pascaligo.ml            | 57 +++++++------------
 src/passes/5-self_ast_typed/tail_recursion.ml |  2 +-
 3 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/gitlab-pages/docs/language-basics/functions.md b/gitlab-pages/docs/language-basics/functions.md
index 18173b545..5d34a5e74 100644
--- a/gitlab-pages/docs/language-basics/functions.md
+++ b/gitlab-pages/docs/language-basics/functions.md
@@ -307,7 +307,7 @@ At the moment, recursive function are limited to one (possibly tupled) parameter
 limited to tail recursion (i.e the recursive call should be the last expression of the function)
 
 <Syntax syntax="pascaligo">
-In PascaLigo recursive functions are defined using the "recursive" keyword
+In PascaLigo recursive functions are defined using the `recursive` keyword
 
 ```pascaligo group=d
 recursive function sum (const n : int; const acc: int) : int is
@@ -318,7 +318,7 @@ recursive function fibo (const n: int; const n_1: int; const n_0 :int) : int is
 ```
 </Syntax>
 <Syntax syntax="cameligo">
-In CameLigo recursive functions are defined using the "rec" keyword
+In CameLigo recursive functions are defined using the `rec` keyword
 
 ```cameligo group=d
 let rec sum ((n,acc):int * int) : int =
@@ -329,7 +329,7 @@ let rec fibo ((n,n_1,n_0):int*int*int) : int =
 ```
 </Syntax>
 <Syntax syntax="reasonligo">
-In ReasonLigo recursive functions are defined using the "rec" keyword
+In ReasonLigo recursive functions are defined using the `rec` keyword
 
 ```reasonligo group=d
 let rec sum = ((n, acc) : (int,int)): int =>
diff --git a/src/passes/2-simplify/pascaligo.ml b/src/passes/2-simplify/pascaligo.ml
index fa87cbf15..a0c051f28 100644
--- a/src/passes/2-simplify/pascaligo.ml
+++ b/src/passes/2-simplify/pascaligo.ml
@@ -184,17 +184,6 @@ module Errors = struct
     ] in
     error ~data title message
 
-  let _untyped_recursive_function var =
-    let title () = "" in
-    let message () =
-      Format.asprintf "\nUntyped recursive function \
-                       are not supported yet.\n" in
-    let param_loc = var.Region.region in
-    let data = [
-      ("location",
-       fun () -> Format.asprintf "%a" Location.pp_lift @@ param_loc)]
-    in error ~data title message
-
   (* Logging *)
 
   let simplifying_instruction t =
@@ -751,26 +740,24 @@ and simpl_fun_expression :
   let statements = [] in
   (match param.value.inside with
     a, [] -> (
-      let%bind input = simpl_param a in
-      let (binder , input_type) = input in
-      let%bind instructions = simpl_statement_list statements in
-      let%bind result = simpl_expression return in
-      let%bind output_type = simpl_type_expression ret_type in
-      let body = instructions in
-      let%bind result =
-        let aux prec cur = cur (Some prec) in
-        bind_fold_right_list aux result body in
-      let binder = Var.of_name binder in
-      let fun_type = t_function input_type output_type in
-      let expression : expression = 
-        e_lambda ~loc binder (Some input_type)(Some output_type) result in
-      let%bind expression = match kwd_recursive with
-        None -> ok @@ expression |
-        Some _ -> ok @@ e_recursive ~loc binder fun_type 
-        @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
-      in
-      ok (Some fun_type , expression)
-     )
+        let%bind input = simpl_param a in
+        let (binder , input_type) = input in
+        let%bind instructions = simpl_statement_list statements in
+        let%bind result = simpl_expression return in
+        let%bind output_type = simpl_type_expression ret_type in
+        let body = instructions in
+        let%bind result =
+          let aux prec cur = cur (Some prec) in
+          bind_fold_right_list aux result body in
+        let binder = Var.of_name binder in
+        let fun_type = t_function input_type output_type in
+        let expression = match kwd_recursive with
+          | None -> e_lambda ~loc binder (Some input_type)(Some output_type) result
+          | Some _ -> e_recursive ~loc binder fun_type 
+          @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
+        in
+        ok (Some fun_type , expression)
+      )
    | lst -> (
        let lst = npseq_to_list lst in
        (* TODO wrong, should be fresh? *)
@@ -795,11 +782,9 @@ and simpl_fun_expression :
          let aux prec cur = cur (Some prec) in
          bind_fold_right_list aux result body in
       let fun_type = t_function input_type output_type in
-      let expression : expression = 
-        e_lambda ~loc binder (Some input_type)(Some output_type) result in
-      let%bind expression = match kwd_recursive with
-        None -> ok @@ expression |
-        Some _ -> ok @@ e_recursive ~loc binder fun_type 
+      let expression = match kwd_recursive with
+        | None -> e_lambda ~loc binder (Some input_type)(Some output_type) result
+        | Some _ -> e_recursive ~loc binder fun_type 
         @@ {binder;input_type=Some input_type; output_type= Some output_type; result}
       in
       ok (Some fun_type , expression)
diff --git a/src/passes/5-self_ast_typed/tail_recursion.ml b/src/passes/5-self_ast_typed/tail_recursion.ml
index 5d22d6104..3e971c79e 100644
--- a/src/passes/5-self_ast_typed/tail_recursion.ml
+++ b/src/passes/5-self_ast_typed/tail_recursion.ml
@@ -3,7 +3,7 @@ open Trace
 
 module Errors = struct
   let recursive_call_is_only_allowed_as_the_last_operation name loc () =
-    let title = (thunk ("Recursive call is only allowed as the last operation")) in
+    let title = (thunk ("Recursion must be achieved through tail-calls only")) in
     let message () = "" in
     let data = [
       ("function" , fun () -> Format.asprintf "%a" PP.expression_variable name);

From 660dcbb79f78ea3ba42782c584fbf3b9cec71014 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Thu, 12 Mar 2020 15:41:26 +0100
Subject: [PATCH 26/43] review 3

---
 src/bin/expect_tests/contract_tests.ml        |  4 +--
 .../expect_tests/ligo_interpreter_tests.ml    |  3 +-
 src/bin/expect_tests/typer_error_tests.ml     |  2 +-
 src/passes/6-interpreter/interpreter.ml       | 11 +++++--
 src/passes/6-transpiler/transpiler.ml         | 29 ++++++++++---------
 src/passes/8-compiler/compiler_program.ml     |  9 ++----
 src/stages/ligo_interpreter/PP.ml             |  3 +-
 src/stages/ligo_interpreter/types.ml          |  1 +
 src/test/contracts/interpret_test.mligo       |  7 +++++
 test.mligo                                    |  8 +++++
 10 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100644 test.mligo

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 1bb5d7969..1acee5fbc 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#808 = #P in let p = rhs#808.0 in let s = rhs#808.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#814 = #P in let p = rhs#814.0 in let s = rhs#814.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
diff --git a/src/bin/expect_tests/ligo_interpreter_tests.ml b/src/bin/expect_tests/ligo_interpreter_tests.ml
index ac381ea71..3dbf06bde 100644
--- a/src/bin/expect_tests/ligo_interpreter_tests.ml
+++ b/src/bin/expect_tests/ligo_interpreter_tests.ml
@@ -53,4 +53,5 @@ let%expect_test _ =
     val s = { ; 1 : int ; 2 : int ; 3 : int}
     val set_add = {  ; 0 = ({ ; 1 : int ; 2 : int ; 3 : int}) ; 1 = ({ ; 1 : int ; 2 : int ; 3 : int ; 4 : int}) ; 2 = ({ ; 1 : int}) }
     val set_iter_fail = "set_iter_fail" : failure
-    val set_mem = {  ; 0 = (true) ; 1 = (false) ; 2 = (false) } |}] ;
\ No newline at end of file
+    val set_mem = {  ; 0 = (true) ; 1 = (false) ; 2 = (false) }
+    val recursion = 55 : int |}] ;
\ No newline at end of file
diff --git a/src/bin/expect_tests/typer_error_tests.ml b/src/bin/expect_tests/typer_error_tests.ml
index b28509e3f..ecf5ce7e3 100644
--- a/src/bin/expect_tests/typer_error_tests.ml
+++ b/src/bin/expect_tests/typer_error_tests.ml
@@ -42,7 +42,7 @@ let%expect_test _ =
 
   run_ligo_bad [ "compile-contract" ; "../../test/contracts/negative/error_no_tail_recursive_function.mligo"; "f"];
   [%expect {|
-    ligo: in file "error_no_tail_recursive_function.mligo", line 2, characters 14-21. Recursive call is only allowed as the last operation:  {"function":"unvalid","location":"in file \"error_no_tail_recursive_function.mligo\", line 2, characters 14-21"}
+    ligo: in file "error_no_tail_recursive_function.mligo", line 2, characters 14-21. Recursion must be achieved through tail-calls only:  {"function":"unvalid","location":"in file \"error_no_tail_recursive_function.mligo\", line 2, characters 14-21"}
 
 
      If you're not sure how to fix this error, you can
diff --git a/src/passes/6-interpreter/interpreter.ml b/src/passes/6-interpreter/interpreter.ml
index b93d0cf60..96957225c 100644
--- a/src/passes/6-interpreter/interpreter.ml
+++ b/src/passes/6-interpreter/interpreter.ml
@@ -277,10 +277,17 @@ and eval : Ast_typed.expression -> env -> value result
         let%bind args' = eval args env in
         let f_env' = Env.extend f_env (arg_names, args') in
         eval body f_env'
+      | V_Func_rec (_fun_name,_fun_type,lambda, _env) ->
+        let%bind args' = eval args env in
+        let f_env' = Env.extend env (lambda.binder,args') in
+        eval lambda.result f_env'
       | _ -> simple_fail "trying to apply on something that is not a function"
     )
-    | E_lambda { binder; result;} ->
+    | E_lambda {binder; result;} ->
       ok @@ V_Func_val (binder,result,env)
+    | E_recursive {fun_name; fun_type;lambda} ->
+      let env' = Env.extend env (fun_name, V_Func_rec(fun_name,fun_type,lambda,env)) in
+      ok @@ V_Func_rec (fun_name,fun_type,lambda,env')
     | E_let_in { let_binder; rhs; let_result; _} ->
       let%bind rhs' = eval rhs env in
       eval let_result (Env.extend env (let_binder,rhs'))
@@ -371,7 +378,7 @@ and eval : Ast_typed.expression -> env -> value result
       | _ -> simple_fail "not yet supported case"
         (* ((ctor,name),body) *)
     )
-    | E_look_up _ | E_recursive _ ->
+    | E_look_up _ ->
       let serr = Format.asprintf "Unsupported construct :\n %a\n" Ast_typed.PP.expression term in
       simple_fail serr
 
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/6-transpiler/transpiler.ml
index bb959bcd5..3cf73747e 100644
--- a/src/passes/6-transpiler/transpiler.ml
+++ b/src/passes/6-transpiler/transpiler.ml
@@ -536,22 +536,23 @@ and transpile_recursive {fun_name; fun_type; lambda} =
         let%bind (body,l) = map_lambda fun_name loop_type result in
         ok @@ (Expression.make (E_closure {binder;body}) loop_type, binder::l)
       | _  -> 
-        let%bind res = replace_callback fun_name loop_type e in
+        let%bind res = replace_callback fun_name loop_type false e in
         ok @@ (res, [])
 
-  and replace_callback : AST.expression_variable -> type_value -> AST.expression -> expression result = fun fun_name loop_type e ->
+  and replace_callback : AST.expression_variable -> type_value -> bool -> AST.expression -> expression result = fun fun_name loop_type shadowed e ->
     match e.expression_content with
-      E_let_in li ->
-        let%bind let_result = replace_callback fun_name loop_type li.let_result in
+      E_let_in li -> 
+        let shadowed = shadowed || Var.equal li.let_binder fun_name in 
+        let%bind let_result = replace_callback fun_name loop_type shadowed li.let_result in
         let%bind rhs = transpile_annotated_expression li.rhs in
         let%bind ty  = transpile_type e.type_expression in
         ok @@ e_let_in li.let_binder ty li.inline rhs let_result |
       E_matching m -> 
         let%bind ty = transpile_type e.type_expression in
-        matching fun_name loop_type m ty |
+        matching fun_name loop_type shadowed m ty |
       E_application {expr1;expr2} -> (
-        match expr1.expression_content with
-        E_variable name when Var.equal fun_name name -> 
+        match expr1.expression_content,shadowed with
+        E_variable name, false when Var.equal fun_name name -> 
           let%bind expr = transpile_annotated_expression expr2 in
           ok @@ Expression.make (E_constant {cons_name=C_LOOP_CONTINUE;arguments=[expr]}) loop_type |
         _ -> 
@@ -561,18 +562,18 @@ and transpile_recursive {fun_name; fun_type; lambda} =
       _ -> 
         let%bind expr = transpile_annotated_expression e in
         ok @@ Expression.make (E_constant {cons_name=C_LOOP_STOP;arguments=[expr]}) loop_type
-  and matching : AST.expression_variable -> type_value -> AST.matching -> type_value -> expression result = fun fun_name loop_type m ty ->
+  and matching : AST.expression_variable -> type_value -> bool -> AST.matching -> type_value -> expression result = fun fun_name loop_type shadowed m ty ->
     let return ret = ok @@ Expression.make ret @@ ty in
     let%bind expr = transpile_annotated_expression m.matchee in
     match m.cases with
       Match_bool {match_true; match_false} -> 
-          let%bind (t , f) = bind_map_pair (replace_callback fun_name loop_type) (match_true, match_false) in
+          let%bind (t , f) = bind_map_pair (replace_callback fun_name loop_type shadowed) (match_true, match_false) in
           return @@ E_if_bool (expr, t, f)
       | Match_option { match_none; match_some = (name, s, tv) } ->
-          let%bind n = replace_callback fun_name loop_type match_none in
+          let%bind n = replace_callback fun_name loop_type shadowed match_none in
           let%bind (tv' , s') =
             let%bind tv' = transpile_type tv in
-            let%bind s' = replace_callback fun_name loop_type s in
+            let%bind s' = replace_callback fun_name loop_type shadowed s in
             ok (tv' , s')
           in
           return @@ E_if_none (expr , n , ((name , tv') , s'))
@@ -580,10 +581,10 @@ and transpile_recursive {fun_name; fun_type; lambda} =
           match_nil ;
           match_cons = ((hd_name) , (tl_name), match_cons, ty) ;
         } -> (
-          let%bind nil = replace_callback fun_name loop_type match_nil in
+          let%bind nil = replace_callback fun_name loop_type shadowed match_nil in
           let%bind cons =
             let%bind ty' = transpile_type ty in
-            let%bind match_cons' = replace_callback fun_name loop_type match_cons in
+            let%bind match_cons' = replace_callback fun_name loop_type shadowed match_cons in
             ok (((hd_name , ty') , (tl_name , ty')) , match_cons')
           in
           return @@ E_if_cons (expr , nil , cons)
@@ -614,7 +615,7 @@ and transpile_recursive {fun_name; fun_type; lambda} =
                 let%bind ((_ , name) , body) =
                   trace_option (corner_case ~loc:__LOC__ "missing match clause") @@
                   List.find_opt (fun ((constructor_name' , _) , _) -> constructor_name' = constructor_name) lst in
-                let%bind body' = replace_callback fun_name loop_type body in
+                let%bind body' = replace_callback fun_name loop_type shadowed body in
                 return @@ E_let_in ((name , tv) , false , top , body')
               )
             | ((`Node (a , b)) , tv) ->
diff --git a/src/passes/8-compiler/compiler_program.ml b/src/passes/8-compiler/compiler_program.ml
index 6d24bd06b..9a2001298 100644
--- a/src/passes/8-compiler/compiler_program.ml
+++ b/src/passes/8-compiler/compiler_program.ml
@@ -59,13 +59,12 @@ let rec get_operator : constant' -> type_value -> expression list -> predicate r
       | C_LOOP_CONTINUE -> (
           let%bind (_,ty) = get_t_or ty in
           let%bind m_ty = Compiler_type.type_ ty in
-          let m_ty' = t_pair t_unit m_ty in
-          ok @@ simple_unary @@ prim ~children:[m_ty'] I_LEFT
+          ok @@ simple_unary @@ prim ~children:[m_ty] I_LEFT
       )
       | C_LOOP_STOP -> (
           let%bind (ty, _) = get_t_or ty in
           let%bind m_ty = Compiler_type.type_ ty in
-          ok @@ simple_unary @@ seq [ i_push_unit; i_pair; prim ~children:[m_ty] I_RIGHT]
+          ok @@ simple_unary @@ prim ~children:[m_ty] I_RIGHT
       )
       | C_SET_EMPTY -> (
           let%bind ty' = Mini_c.get_t_set ty in
@@ -410,12 +409,10 @@ and translate_expression (expr:expression) (env:environment) : michelson result
       | C_LOOP_LEFT -> (
           let%bind (_, ty) = get_t_or (snd v) in
           let%bind m_ty = Compiler_type.type_ ty in
-          let m_ty' = t_pair t_unit m_ty in
           let%bind code = ok (seq [
               expr' ;
-              prim ~children:[m_ty'] I_LEFT;
+              prim ~children:[m_ty] I_LEFT;
               i_loop_left body';
-              prim I_CDR
             ]) in
           return code
         )
diff --git a/src/stages/ligo_interpreter/PP.ml b/src/stages/ligo_interpreter/PP.ml
index b47b4993a..d0e419136 100644
--- a/src/stages/ligo_interpreter/PP.ml
+++ b/src/stages/ligo_interpreter/PP.ml
@@ -19,6 +19,7 @@ let rec pp_value : value -> string = function
       recmap "" in
     Format.asprintf "{ %s }" content
   | V_Func_val _ -> Format.asprintf "<fun>"
+  | V_Func_rec _ -> Format.asprintf "<rec fun>"
   | V_Construct (name,v) -> Format.asprintf "%s(%s)" name (pp_value v)
   | V_List vl ->
     Format.asprintf "[%s]" @@
@@ -36,4 +37,4 @@ let pp_env : env -> unit = fun env ->
     Format.printf "\t%s -> %s\n" (Var.to_name var) (pp_value v))
   env in
   let () = Format.printf "\n}\n" in
-  ()
\ No newline at end of file
+  ()
diff --git a/src/stages/ligo_interpreter/types.ml b/src/stages/ligo_interpreter/types.ml
index 4cd8e79ad..b9f9a7e5e 100644
--- a/src/stages/ligo_interpreter/types.ml
+++ b/src/stages/ligo_interpreter/types.ml
@@ -31,6 +31,7 @@ and constant_val =
 
 and value =
   | V_Func_val of (expression_variable * Ast_typed.expression * env)
+  | V_Func_rec of (expression_variable * Ast_typed.type_expression * Ast_typed.lambda * env)
   | V_Ct of constant_val
   | V_List of value list
   | V_Record of value label_map
diff --git a/src/test/contracts/interpret_test.mligo b/src/test/contracts/interpret_test.mligo
index c06113589..ebabbcf53 100644
--- a/src/test/contracts/interpret_test.mligo
+++ b/src/test/contracts/interpret_test.mligo
@@ -232,3 +232,10 @@ let set_mem =
   Set.mem 1 s,
   Set.mem 4 s,
   Set.mem 1 (Set.empty : int set)
+
+let recursion =
+  let rec sum : int*int -> int = fun ((n,res):int*int) ->
+    let i = 1 in
+    if (n<1) then res else sum (n-i,res+n)
+  in
+  sum (10,0)
diff --git a/test.mligo b/test.mligo
new file mode 100644
index 000000000..f197fc1da
--- /dev/null
+++ b/test.mligo
@@ -0,0 +1,8 @@
+let rec fibo2 ((n,n_1,n_0):int*int*int) : int =
+  let fibo2 : int -> int = fun (k : int) -> k in
+  if (n < 2) then n_1 else fibo2 3
+
+let main (p,s : unit * int) : operation list * int =
+  let x : int = fibo2 (5, 1, 1) in
+  (([] : operation list), x)
+

From 3a80fadcc82a4dd76e0d9b1356f4217e26cbcbd1 Mon Sep 17 00:00:00 2001
From: Lesenechal Remi <lesenechal.remi@gmail.com>
Date: Thu, 12 Mar 2020 17:32:49 +0100
Subject: [PATCH 27/43] rewrite interpreter recursion within the initial
 formalism.

---
 src/bin/expect_tests/ligo_interpreter_tests.ml |  4 +++-
 src/passes/6-interpreter/interpreter.ml        | 18 +++++++++---------
 src/stages/ligo_interpreter/types.ml           |  2 +-
 src/test/contracts/interpret_test.mligo        |  7 ++++++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/bin/expect_tests/ligo_interpreter_tests.ml b/src/bin/expect_tests/ligo_interpreter_tests.ml
index 3dbf06bde..9a6069338 100644
--- a/src/bin/expect_tests/ligo_interpreter_tests.ml
+++ b/src/bin/expect_tests/ligo_interpreter_tests.ml
@@ -54,4 +54,6 @@ let%expect_test _ =
     val set_add = {  ; 0 = ({ ; 1 : int ; 2 : int ; 3 : int}) ; 1 = ({ ; 1 : int ; 2 : int ; 3 : int ; 4 : int}) ; 2 = ({ ; 1 : int}) }
     val set_iter_fail = "set_iter_fail" : failure
     val set_mem = {  ; 0 = (true) ; 1 = (false) ; 2 = (false) }
-    val recursion = 55 : int |}] ;
\ No newline at end of file
+    val recursion_let_rec_in = 55 : int
+    val sum_rec = <rec fun>
+    val top_level_recursion = 55 : int |}] ;
\ No newline at end of file
diff --git a/src/passes/6-interpreter/interpreter.ml b/src/passes/6-interpreter/interpreter.ml
index 96957225c..cdbee239c 100644
--- a/src/passes/6-interpreter/interpreter.ml
+++ b/src/passes/6-interpreter/interpreter.ml
@@ -272,25 +272,23 @@ and eval : Ast_typed.expression -> env -> value result
     match term.expression_content with
     | E_application ({expr1 = f; expr2 = args}) -> (
       let%bind f' = eval f env in
+      let%bind args' = eval args env in
       match f' with
       | V_Func_val (arg_names, body, f_env) ->
-        let%bind args' = eval args env in
         let f_env' = Env.extend f_env (arg_names, args') in
         eval body f_env'
-      | V_Func_rec (_fun_name,_fun_type,lambda, _env) ->
-        let%bind args' = eval args env in
-        let f_env' = Env.extend env (lambda.binder,args') in
-        eval lambda.result f_env'
+      | V_Func_rec (fun_name, arg_names, body, f_env) ->
+        let f_env' = Env.extend f_env (arg_names, args') in
+        let f_env'' = Env.extend f_env' (fun_name, f') in
+        eval body f_env''
       | _ -> simple_fail "trying to apply on something that is not a function"
     )
     | E_lambda {binder; result;} ->
       ok @@ V_Func_val (binder,result,env)
-    | E_recursive {fun_name; fun_type;lambda} ->
-      let env' = Env.extend env (fun_name, V_Func_rec(fun_name,fun_type,lambda,env)) in
-      ok @@ V_Func_rec (fun_name,fun_type,lambda,env')
-    | E_let_in { let_binder; rhs; let_result; _} ->
+    | E_let_in {let_binder ; rhs; let_result} -> (
       let%bind rhs' = eval rhs env in
       eval let_result (Env.extend env (let_binder,rhs'))
+    )
     | E_map kvlist | E_big_map kvlist ->
       let%bind kvlist' = bind_map_list
         (fun kv -> bind_map_pair (fun (el:Ast_typed.expression) -> eval el env) kv)
@@ -378,6 +376,8 @@ and eval : Ast_typed.expression -> env -> value result
       | _ -> simple_fail "not yet supported case"
         (* ((ctor,name),body) *)
     )
+    | E_recursive {fun_name; fun_type=_; lambda} ->
+      ok @@ V_Func_rec (fun_name, lambda.binder, lambda.result, env)
     | E_look_up _ ->
       let serr = Format.asprintf "Unsupported construct :\n %a\n" Ast_typed.PP.expression term in
       simple_fail serr
diff --git a/src/stages/ligo_interpreter/types.ml b/src/stages/ligo_interpreter/types.ml
index b9f9a7e5e..d2274e9ee 100644
--- a/src/stages/ligo_interpreter/types.ml
+++ b/src/stages/ligo_interpreter/types.ml
@@ -31,7 +31,7 @@ and constant_val =
 
 and value =
   | V_Func_val of (expression_variable * Ast_typed.expression * env)
-  | V_Func_rec of (expression_variable * Ast_typed.type_expression * Ast_typed.lambda * env)
+  | V_Func_rec of (expression_variable * expression_variable * Ast_typed.expression * env)
   | V_Ct of constant_val
   | V_List of value list
   | V_Record of value label_map
diff --git a/src/test/contracts/interpret_test.mligo b/src/test/contracts/interpret_test.mligo
index ebabbcf53..07932653e 100644
--- a/src/test/contracts/interpret_test.mligo
+++ b/src/test/contracts/interpret_test.mligo
@@ -233,9 +233,14 @@ let set_mem =
   Set.mem 4 s,
   Set.mem 1 (Set.empty : int set)
 
-let recursion =
+let recursion_let_rec_in =
   let rec sum : int*int -> int = fun ((n,res):int*int) ->
     let i = 1 in
     if (n<1) then res else sum (n-i,res+n)
   in
   sum (10,0)
+
+let rec sum_rec ((n,acc):int * int) : int =
+    if (n < 1) then acc else sum_rec (n-1, acc+n)
+
+let top_level_recursion = sum_rec (10,0)
\ No newline at end of file

From 8a0e1dfea428d727b3d26bb81ecb71286583edca Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Thu, 12 Mar 2020 18:50:42 +0100
Subject: [PATCH 28/43] dune promote

---
 src/bin/expect_tests/contract_tests.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 1acee5fbc..3bcb48aa0 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#811 = #P in let p = rhs#811.0 in let s = rhs#811.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#812 = #P in let p = rhs#812.0 in let s = rhs#812.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#814 = #P in let p = rhs#814.0 in let s = rhs#814.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#815 = #P in let p = rhs#815.0 in let s = rhs#815.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can

From 1aecc4eb041edc94f3b8893997b7ea4a5ccc1184 Mon Sep 17 00:00:00 2001
From: Maksym Bykovskyy <maksym@ecadlabs.com>
Date: Thu, 12 Mar 2020 20:26:13 +0000
Subject: [PATCH 29/43] Tezos client command

---
 tools/webide/packages/client/package.json     |   1 +
 .../components/configure/configure-tab.tsx    |  57 ++++---
 .../configure/generate-command-pane.tsx       |  85 ++++++++++
 .../client/src/components/editor/editor.tsx   |  20 ++-
 .../src/components/editor/syntax-select.tsx   | 157 ------------------
 .../client/src/components/form/checkbox.tsx   |   3 +-
 .../client/src/components/form/inputs.tsx     |   9 +-
 .../command-select.tsx => form/select.tsx}    |  97 ++++++-----
 .../client/src/components/form/toggle.tsx     |  83 ---------
 .../components/output/compile-output-pane.tsx |  31 +---
 .../output/generate-command-output-pane.tsx   |  45 +++++
 .../src/components/output/output-tab.tsx      |   8 +
 .../src/components/output/output-toolbar.tsx  |  27 +--
 .../client/src/components/output/utils.ts     |  28 ++++
 .../src/redux/actions/generate-command.ts     | 112 +++++++++++++
 tools/webide/packages/client/src/redux/app.ts |   3 +
 .../client/src/redux/generate-command.ts      |  81 +++++++++
 .../webide/packages/client/src/redux/types.ts |  11 +-
 .../packages/client/src/services/api.ts       |   3 +
 .../server/src/handlers/compile-storage.ts    |  52 ++++++
 tools/webide/packages/server/src/index.ts     |   2 +
 tools/webide/yarn.lock                        |   5 +
 22 files changed, 567 insertions(+), 353 deletions(-)
 create mode 100644 tools/webide/packages/client/src/components/configure/generate-command-pane.tsx
 delete mode 100644 tools/webide/packages/client/src/components/editor/syntax-select.tsx
 rename tools/webide/packages/client/src/components/{configure/command-select.tsx => form/select.tsx} (52%)
 delete mode 100644 tools/webide/packages/client/src/components/form/toggle.tsx
 create mode 100644 tools/webide/packages/client/src/components/output/generate-command-output-pane.tsx
 create mode 100644 tools/webide/packages/client/src/components/output/utils.ts
 create mode 100644 tools/webide/packages/client/src/redux/actions/generate-command.ts
 create mode 100644 tools/webide/packages/client/src/redux/generate-command.ts
 create mode 100644 tools/webide/packages/server/src/handlers/compile-storage.ts

diff --git a/tools/webide/packages/client/package.json b/tools/webide/packages/client/package.json
index 53012c75e..d6ef4e53c 100644
--- a/tools/webide/packages/client/package.json
+++ b/tools/webide/packages/client/package.json
@@ -25,6 +25,7 @@
     "redux": "^4.0.4",
     "redux-devtools": "^3.5.0",
     "redux-thunk": "^2.3.0",
+    "slugify": "^1.4.0",
     "styled-components": "^4.4.0",
     "typescript": "3.6.4"
   },
diff --git a/tools/webide/packages/client/src/components/configure/configure-tab.tsx b/tools/webide/packages/client/src/components/configure/configure-tab.tsx
index 1292cd09c..0023f3ffc 100644
--- a/tools/webide/packages/client/src/components/configure/configure-tab.tsx
+++ b/tools/webide/packages/client/src/components/configure/configure-tab.tsx
@@ -7,15 +7,17 @@ import { DeployAction } from '../../redux/actions/deploy';
 import { DryRunAction } from '../../redux/actions/dry-run';
 import { EvaluateFunctionAction } from '../../redux/actions/evaluate-function';
 import { EvaluateValueAction } from '../../redux/actions/evaluate-value';
+import { GenerateCommandAction } from '../../redux/actions/generate-command';
 import { AppState } from '../../redux/app';
 import { ChangeDispatchedAction, ChangeSelectedAction, CommandState } from '../../redux/command';
 import { Command } from '../../redux/types';
-import { CommandSelectComponent } from './command-select';
+import { Option, Select } from '../form/select';
 import { CompilePaneComponent } from './compile-pane';
 import { DeployPaneComponent } from './deploy-pane';
 import { DryRunPaneComponent } from './dry-run-pane';
 import { EvaluateFunctionPaneComponent } from './evaluate-function-pane';
 import { EvaluateValuePaneComponent } from './evaluate-value-pane';
+import { GenerateCommandPaneComponent } from './generate-command-pane';
 
 const Container = styled.div<{ visible?: boolean }>`
   position: absolute;
@@ -58,8 +60,8 @@ const RunButton = styled.div`
   background-color: var(--orange);
 `;
 
-const CommandPaneContainer = styled.div`
-  padding-top: 1em;
+const SelectCommand = styled(Select)`
+  flex: 2;
 `;
 
 function createAction(command: Command) {
@@ -74,6 +76,8 @@ function createAction(command: Command) {
       return new EvaluateValueAction();
     case Command.EvaluateFunction:
       return new EvaluateFunctionAction();
+    case Command.GenerateCommand:
+      return new GenerateCommandAction();
     default:
       throw new Error('Unsupported command');
   }
@@ -97,12 +101,20 @@ export const ConfigureTabComponent = (props: {
   return (
     <Container visible={props.selected}>
       <CommonActionsGroup>
-        <CommandSelectComponent
-          selected={command}
+        <SelectCommand
+          id="command-select"
+          value={command}
           onChange={command => {
             dispatch({ ...new ChangeSelectedAction(command) });
           }}
-        ></CommandSelectComponent>
+        >
+          <Option value={Command.Compile}>Compile</Option>
+          <Option value={Command.Deploy}>Deploy</Option>
+          <Option value={Command.DryRun}>Dry Run</Option>
+          <Option value={Command.EvaluateFunction}>Evaluate Function</Option>
+          <Option value={Command.EvaluateValue}>Evaluate Value</Option>
+          <Option value={Command.GenerateCommand}>Generate Command</Option>
+        </SelectCommand>
         <RunButton
           id="run"
           onClick={() => {
@@ -120,23 +132,24 @@ export const ConfigureTabComponent = (props: {
           Run
         </RunButton>
       </CommonActionsGroup>
-      <CommandPaneContainer>
-        {(command === Command.Compile && (
-          <CompilePaneComponent></CompilePaneComponent>
+      {(command === Command.Compile && (
+        <CompilePaneComponent></CompilePaneComponent>
+      )) ||
+        (command === Command.DryRun && (
+          <DryRunPaneComponent></DryRunPaneComponent>
         )) ||
-          (command === Command.DryRun && (
-            <DryRunPaneComponent></DryRunPaneComponent>
-          )) ||
-          (command === Command.Deploy && (
-            <DeployPaneComponent></DeployPaneComponent>
-          )) ||
-          (command === Command.EvaluateFunction && (
-            <EvaluateFunctionPaneComponent></EvaluateFunctionPaneComponent>
-          )) ||
-          (command === Command.EvaluateValue && (
-            <EvaluateValuePaneComponent></EvaluateValuePaneComponent>
-          ))}
-      </CommandPaneContainer>
+        (command === Command.Deploy && (
+          <DeployPaneComponent></DeployPaneComponent>
+        )) ||
+        (command === Command.EvaluateFunction && (
+          <EvaluateFunctionPaneComponent></EvaluateFunctionPaneComponent>
+        )) ||
+        (command === Command.EvaluateValue && (
+          <EvaluateValuePaneComponent></EvaluateValuePaneComponent>
+        )) ||
+        (command === Command.GenerateCommand && (
+          <GenerateCommandPaneComponent></GenerateCommandPaneComponent>
+        ))}
     </Container>
   );
 };
diff --git a/tools/webide/packages/client/src/components/configure/generate-command-pane.tsx b/tools/webide/packages/client/src/components/configure/generate-command-pane.tsx
new file mode 100644
index 000000000..da56264af
--- /dev/null
+++ b/tools/webide/packages/client/src/components/configure/generate-command-pane.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
+
+import { AppState } from '../../redux/app';
+import {
+  ChangeCommandAction,
+  ChangeEntrypointAction,
+  ChangeStorageAction,
+  ChangeToolAction,
+  GenerateCommandState,
+} from '../../redux/generate-command';
+import { Tool, ToolCommand } from '../../redux/types';
+import { AccessFunctionLabel, Group, Input, Label, Textarea } from '../form/inputs';
+import { Option, Select } from '../form/select';
+
+const Container = styled.div`
+  overflow: auto;
+`;
+
+export const GenerateCommandPaneComponent = () => {
+  const dispatch = useDispatch();
+
+  const tool = useSelector<AppState, GenerateCommandState['tool']>(
+    state => state.generateCommand.tool
+  );
+
+  const command = useSelector<AppState, GenerateCommandState['command']>(
+    state => state.generateCommand.command
+  );
+
+  const entrypoint = useSelector<AppState, GenerateCommandState['entrypoint']>(
+    state => state.generateCommand.entrypoint
+  );
+
+  const storage = useSelector<AppState, GenerateCommandState['storage']>(
+    state => state.generateCommand.storage
+  );
+
+  return (
+    <Container>
+      <Group>
+        <Label>Tool</Label>
+        <Select
+          id="tool"
+          value={tool}
+          onChange={value => dispatch({ ...new ChangeToolAction(value) })}
+        >
+          <Option value={Tool.TezosClient}>Tezos Client</Option>
+        </Select>
+      </Group>
+      <Group>
+        <Label>Command</Label>
+        <Select
+          id="tool-command"
+          value={command}
+          onChange={value => dispatch({ ...new ChangeCommandAction(value) })}
+        >
+          <Option value={ToolCommand.Originate}>Originate</Option>
+        </Select>
+      </Group>
+      <Group>
+        <AccessFunctionLabel htmlFor="entrypoint"></AccessFunctionLabel>
+        <Input
+          id="entrypoint"
+          value={entrypoint}
+          onChange={ev =>
+            dispatch({ ...new ChangeEntrypointAction(ev.target.value) })
+          }
+        ></Input>
+      </Group>
+      <Group>
+        <Label htmlFor="storage">Storage</Label>
+        <Textarea
+          id="storage"
+          rows={9}
+          value={storage}
+          onChange={ev =>
+            dispatch({ ...new ChangeStorageAction(ev.target.value) })
+          }
+        ></Textarea>
+      </Group>
+    </Container>
+  );
+};
diff --git a/tools/webide/packages/client/src/components/editor/editor.tsx b/tools/webide/packages/client/src/components/editor/editor.tsx
index f75009b07..6ed4571e0 100644
--- a/tools/webide/packages/client/src/components/editor/editor.tsx
+++ b/tools/webide/packages/client/src/components/editor/editor.tsx
@@ -3,11 +3,12 @@ import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 
 import { AppState } from '../../redux/app';
-import { ChangeTitleAction } from '../../redux/editor';
+import { ChangeLanguageAction, ChangeTitleAction, EditorState } from '../../redux/editor';
+import { Language } from '../../redux/types';
+import { Option, Select } from '../form/select';
 import { ShareComponent } from '../share';
 import { EditableTitleComponent } from './editable-title';
 import { MonacoComponent } from './monaco';
-import { SyntaxSelectComponent } from './syntax-select';
 
 const Container = styled.div`
   flex: 2;
@@ -35,6 +36,9 @@ const StyledEditableTitleComponent = styled(EditableTitleComponent)`
 export const EditorComponent = () => {
   const dispatch = useDispatch();
   const title = useSelector<AppState, string>(state => state.editor.title);
+  const language = useSelector<AppState, EditorState['language']>(
+    state => state.editor.language
+  );
 
   return (
     <Container>
@@ -49,7 +53,17 @@ export const EditorComponent = () => {
             }}
           ></StyledEditableTitleComponent>
         </LeftActions>
-        <SyntaxSelectComponent></SyntaxSelectComponent>
+        <Select
+          id="syntax-select"
+          value={language}
+          onChange={language => {
+            dispatch({ ...new ChangeLanguageAction(language) });
+          }}
+        >
+          <Option value={Language.PascaLigo}>PascaLIGO</Option>
+          <Option value={Language.CameLigo}>CameLIGO</Option>
+          <Option value={Language.ReasonLIGO}>ReasonLIGO</Option>
+        </Select>
       </Header>
       <MonacoComponent></MonacoComponent>
     </Container>
diff --git a/tools/webide/packages/client/src/components/editor/syntax-select.tsx b/tools/webide/packages/client/src/components/editor/syntax-select.tsx
deleted file mode 100644
index dcb935e7e..000000000
--- a/tools/webide/packages/client/src/components/editor/syntax-select.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { faCaretDown } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { useState } from 'react';
-import OutsideClickHandler from 'react-outside-click-handler';
-import { useDispatch, useSelector } from 'react-redux';
-import styled, { css } from 'styled-components';
-
-import { AppState } from '../../redux/app';
-import { ChangeLanguageAction, EditorState } from '../../redux/editor';
-import { Language } from '../../redux/types';
-import { Tooltip } from '../tooltip';
-
-const Container = styled.div`
-  display: flex;
-  position: relative;
-  z-index: 2;
-  min-width: 10em;
-`;
-
-const Header = styled.div`
-  cursor: pointer;
-  user-select: none;
-
-  flex: 1;
-  display: flex;
-  height: 2em;
-  padding: 0 0.5em;
-
-  border: 1px solid var(--blue_trans1);
-`;
-
-const Label = styled.div`
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-`;
-
-const ArrowIcon = ({ rotate, ...props }: { rotate: boolean }) => (
-  <FontAwesomeIcon {...props} icon={faCaretDown} size="lg"></FontAwesomeIcon>
-);
-
-const Arrow = styled(ArrowIcon)`
-  margin-left: 0.5em;
-  pointer-events: none;
-  color: var(--blue_trans1);
-  transition: transform 0.15s ease-in;
-
-  ${(props: { rotate: boolean }) =>
-    props.rotate &&
-    css`
-      transform: rotate(180deg);
-    `};
-`;
-
-const List = styled.ul`
-  position: absolute;
-  list-style-type: none;
-  background-color: white;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  box-shadow: 1px 3px 10px 0px rgba(153, 153, 153, 0.4);
-  border-radius: 3px;
-
-  visibility: hidden;
-  opacity: 0;
-  transition: opacity 0.15s ease-in;
-
-  ${(props: { visible: boolean }) =>
-    props.visible &&
-    css`
-      visibility: visible;
-      opacity: 1;
-    `}
-`;
-
-const Option = styled.li`
-  cursor: pointer;
-  user-select: none;
-
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 2em;
-  padding: 0 0.5em;
-
-  &:first-child {
-    border-radius: 3px 3px 0 0;
-  }
-
-  &:last-child {
-    border-radius: 0 0 3px 3px;
-  }
-
-  &:hover {
-    background-color: var(--blue_trans2);
-    font-weight: 600;
-  }
-`;
-
-export const SyntaxSelectComponent = () => {
-  const OPTIONS = {
-    [Language.PascaLigo]: 'PascaLIGO',
-    [Language.CameLigo]: 'CameLIGO',
-    [Language.ReasonLIGO]: 'ReasonLIGO'
-  };
-
-  const moveOptionToTop = (option: Language) => {
-    return Object.keys(OPTIONS).reduce((list, entry) => {
-      if (entry === option) {
-        list.unshift(entry);
-      } else {
-        list.push(entry as Language);
-      }
-      return list;
-    }, [] as Language[]);
-  };
-
-  const language = useSelector<AppState, EditorState['language']>(
-    state => state.editor.language
-  );
-  const dispatch = useDispatch();
-  const [opened, open] = useState(false);
-
-  const selectOption = (option: Language) => {
-    if (language !== option) {
-      dispatch({ ...new ChangeLanguageAction(option) });
-    }
-    open(false);
-  };
-
-  return (
-    <Container>
-      <OutsideClickHandler onOutsideClick={() => open(false)}>
-        <List visible={opened}>
-          {moveOptionToTop(language).map(option => (
-            <Option
-              id={option}
-              key={option}
-              onClick={() => selectOption(option)}
-            >
-              <span>{OPTIONS[option]}</span>
-            </Option>
-          ))}
-        </List>
-      </OutsideClickHandler>
-      <Header id="syntax-select" onClick={() => open(true)}>
-        <Label>
-          {OPTIONS[language]}
-          <Arrow rotate={opened}></Arrow>
-        </Label>
-        <Tooltip>Select syntax</Tooltip>
-      </Header>
-    </Container>
-  );
-};
diff --git a/tools/webide/packages/client/src/components/form/checkbox.tsx b/tools/webide/packages/client/src/components/form/checkbox.tsx
index 8f69ddaa0..9785291e2 100644
--- a/tools/webide/packages/client/src/components/form/checkbox.tsx
+++ b/tools/webide/packages/client/src/components/form/checkbox.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React, { useState } from 'react';
 import styled, { css } from 'styled-components';
 
-const Container = styled.div<{ checked: boolean }>`
+const Container = styled.div`
   display: flex;
   justify-content: center;
   align-items: center;
@@ -44,7 +44,6 @@ export const CheckboxComponent = (props: {
   return (
     <Container
       className={props.className}
-      checked={isChecked}
       onClick={() => {
         const newState = !isChecked;
 
diff --git a/tools/webide/packages/client/src/components/form/inputs.tsx b/tools/webide/packages/client/src/components/form/inputs.tsx
index 721a171bd..9ff057ea7 100644
--- a/tools/webide/packages/client/src/components/form/inputs.tsx
+++ b/tools/webide/packages/client/src/components/form/inputs.tsx
@@ -4,17 +4,20 @@ import styled from 'styled-components';
 export const Group = styled.div`
   display: flex;
   flex-direction: column;
+  margin: 0.7em 0 0.7em 0;
 `;
 
 export const HGroup = styled.div`
   display: flex;
   align-items: center;
+  margin: 0.4em 0 0.4em 0;
 `;
 
 export const Label = styled.label`
   font-size: 1em;
   color: var(--label_foreground);
   user-select: none;
+  margin: 0.3em 0 0.3em 0;
 `;
 
 export const Hint = styled.span`
@@ -25,7 +28,7 @@ export const Hint = styled.span`
 export const AccessFunctionLabel = (props: any) => {
   return (
     <Label {...props}>
-      Access Function
+      Access function
       <br />
       <Hint>The function name from where your contract will start</Hint>
     </Label>
@@ -33,7 +36,7 @@ export const AccessFunctionLabel = (props: any) => {
 };
 
 export const Input = styled.input`
-  margin: 0.3em 0 0.7em 0;
+  /* margin: 0.3em 0 0.7em 0; */
   background-color: var(--input_background);
   border-style: none;
   border-bottom: 5px solid #e1f1ff;
@@ -49,7 +52,7 @@ export const Input = styled.input`
 
 export const Textarea = styled.textarea`
   resize: vertical;
-  margin: 0.3em 0 0.7em 0;
+  /* margin: 0.3em 0 0.7em 0; */
   background-color: var(--input_background);
   border-style: none;
   border-bottom: 5px solid #e1f1ff;
diff --git a/tools/webide/packages/client/src/components/configure/command-select.tsx b/tools/webide/packages/client/src/components/form/select.tsx
similarity index 52%
rename from tools/webide/packages/client/src/components/configure/command-select.tsx
rename to tools/webide/packages/client/src/components/form/select.tsx
index 43711dfd3..b6b9749f5 100644
--- a/tools/webide/packages/client/src/components/configure/command-select.tsx
+++ b/tools/webide/packages/client/src/components/form/select.tsx
@@ -1,17 +1,13 @@
 import { faCaretDown } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { useState } from 'react';
+import React, { FunctionComponentElement, useState } from 'react';
 import OutsideClickHandler from 'react-outside-click-handler';
 import styled, { css } from 'styled-components';
 
-import { Command } from '../../redux/types';
-
 const Container = styled.div`
-  flex: 2;
   display: flex;
   position: relative;
   min-width: 8em;
-  z-index: 2;
 `;
 
 const Header = styled.div`
@@ -20,8 +16,8 @@ const Header = styled.div`
 
   flex: 1;
   display: flex;
-  align-items: center;
   justify-content: space-between;
+  align-items: center;
   min-height: 2em;
   padding: 0 0.5em;
 
@@ -33,6 +29,7 @@ const ArrowIcon = ({ rotate, ...props }: { rotate: boolean }) => (
 );
 
 const Arrow = styled(ArrowIcon)`
+  z-index: 1;
   pointer-events: none;
   color: var(--blue_trans1);
   transition: transform 0.15s ease-in;
@@ -45,6 +42,7 @@ const Arrow = styled(ArrowIcon)`
 `;
 
 const List = styled.ul`
+  z-index: 1;
   position: absolute;
   list-style-type: none;
   background-color: white;
@@ -66,7 +64,7 @@ const List = styled.ul`
     `}
 `;
 
-const Option = styled.li`
+const OptionContainer = styled.li`
   cursor: pointer;
   user-select: none;
 
@@ -90,56 +88,73 @@ const Option = styled.li`
   }
 `;
 
-export const CommandSelectComponent = (props: {
-  selected: Command;
-  onChange?: (value: Command) => void;
-}) => {
-  const OPTIONS = {
-    [Command.Compile]: 'Compile',
-    [Command.Deploy]: 'Deploy',
-    [Command.DryRun]: 'Dry Run',
-    [Command.EvaluateFunction]: 'Evaluate Function',
-    [Command.EvaluateValue]: 'Evaluate Value'
-  };
+interface OptionProps {
+  value: string;
+  children: string;
+}
 
-  const moveOptionToTop = (option: Command) => {
-    return Object.keys(OPTIONS).reduce((list, entry) => {
-      if (entry === option) {
+type OptionElement = FunctionComponentElement<OptionProps>;
+
+export const Option = (props: OptionProps) => {
+  // This is an empty component. It's used as a way to get option information into its parent. It is not inserted into the DOM.
+  return <></>;
+};
+
+export const Select = (props: {
+  id: string;
+  value: any;
+  children: OptionElement[] | OptionElement;
+  onChange?: (value: any) => void;
+  className?: string;
+}) => {
+  const [isOpen, setOpen] = useState(false);
+
+  const options = Array.isArray(props.children)
+    ? props.children
+    : [props.children];
+
+  const labelLookup = new Map(
+    options.map(
+      child => [child.props.value, child.props.children] as [string, string]
+    )
+  );
+
+  const moveOptionToTop = (value: string) => {
+    return options.reduce((list, entry) => {
+      if (entry.props.value === value) {
         list.unshift(entry);
       } else {
-        list.push(entry as Command);
+        list.push(entry);
       }
       return list;
-    }, [] as Command[]);
+    }, [] as OptionElement[]);
   };
 
-  const [opened, open] = useState(false);
-
-  const selectOption = (option: Command) => {
-    if (props.selected !== option && props.onChange) {
-      props.onChange(option);
+  const selectOption = (option: OptionElement) => {
+    if (props.value !== option.props.value && props.onChange) {
+      props.onChange(option.props.value);
     }
-    open(false);
+    setOpen(false);
   };
 
   return (
-    <Container>
-      <OutsideClickHandler onOutsideClick={() => open(false)}>
-        <List visible={opened}>
-          {moveOptionToTop(props.selected).map(option => (
-            <Option
-              id={option}
-              key={option}
+    <Container className={props.className}>
+      <OutsideClickHandler onOutsideClick={() => setOpen(false)}>
+        <List visible={isOpen}>
+          {moveOptionToTop(props.value).map((option: OptionElement) => (
+            <OptionContainer
+              id={option.props.value}
+              key={option.props.value}
               onClick={() => selectOption(option)}
             >
-              <span>{OPTIONS[option]}</span>
-            </Option>
+              <span>{option.props.children}</span>
+            </OptionContainer>
           ))}
         </List>
       </OutsideClickHandler>
-      <Header id="command-select" onClick={() => open(true)}>
-        <span>{OPTIONS[props.selected]}</span>
-        <Arrow rotate={opened}></Arrow>
+      <Header id={props.id} onClick={() => setOpen(true)}>
+        <span>{labelLookup.get(props.value)}</span>
+        <Arrow rotate={isOpen}></Arrow>
       </Header>
     </Container>
   );
diff --git a/tools/webide/packages/client/src/components/form/toggle.tsx b/tools/webide/packages/client/src/components/form/toggle.tsx
deleted file mode 100644
index a1a0b3954..000000000
--- a/tools/webide/packages/client/src/components/form/toggle.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { faCheck } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { useState } from 'react';
-import styled, { css } from 'styled-components';
-
-const Container = styled.div<{ checked: boolean }>`
-  position: relative;
-  height: 2em;
-  width: 3.5em;
-  border-radius: 1em;
-  background-color: var(--blue_trans1);
-  border: 1px solid var(--blue);
-  transition: background-color 0.2s ease-in;
-
-  ${props =>
-    props.checked &&
-    css`
-      background-color: var(--blue);
-    `};
-`;
-
-const Button = styled.div<{ checked: boolean }>`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: absolute;
-
-  height: 2em;
-  width: 2em;
-  background-color: white;
-  border-radius: 50%;
-  cursor: pointer;
-  right: calc(1.5em);
-  transition: right 0.2s ease-in;
-
-  ${props =>
-    props.checked &&
-    css`
-      right: 0;
-    `};
-`;
-
-const CheckIcon = ({ visible, ...props }: { visible: boolean }) => (
-  <FontAwesomeIcon {...props} icon={faCheck}></FontAwesomeIcon>
-);
-
-const Check = styled(CheckIcon)`
-  position: absolute;
-  pointer-events: none;
-  opacity: 1;
-  transition: opacity 0.2s ease-in;
-  color: var(--blue);
-
-  ${props =>
-    !props.visible &&
-    css`
-      opacity: 0;
-    `}
-`;
-
-export const ToggleComponent = (props: {
-  checked: boolean;
-  onChanged: (value: boolean) => void;
-  className?: string;
-}) => {
-  const [isChecked, setChecked] = useState(props.checked);
-
-  return (
-    <Container className={props.className} checked={isChecked}>
-      <Button
-        checked={isChecked}
-        onClick={() => {
-          const newState = !isChecked;
-
-          setChecked(newState);
-          props.onChanged(newState);
-        }}
-      >
-        <Check visible={isChecked}></Check>
-      </Button>
-    </Container>
-  );
-};
diff --git a/tools/webide/packages/client/src/components/output/compile-output-pane.tsx b/tools/webide/packages/client/src/components/output/compile-output-pane.tsx
index 110f9f54e..057892d6d 100644
--- a/tools/webide/packages/client/src/components/output/compile-output-pane.tsx
+++ b/tools/webide/packages/client/src/components/output/compile-output-pane.tsx
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 import { AppState } from '../../redux/app';
 import { ResultState } from '../../redux/result';
 import { OutputToolbarComponent } from './output-toolbar';
+import { copyOutput, downloadOutput } from './utils';
 
 const Container = styled.div<{ visible?: boolean }>`
   display: flex;
@@ -23,35 +24,6 @@ const Pre = styled.pre`
   margin: 0;
 `;
 
-function copyOutput(el: HTMLElement | null) {
-  if (el) {
-    const range = document.createRange();
-    range.selectNodeContents(el);
-
-    const selection = window.getSelection();
-
-    if (selection) {
-      selection.removeAllRanges();
-      selection.addRange(range);
-      document.execCommand('copy');
-    }
-  }
-}
-
-function downloadOutput(output: string) {
-  const anchor = document.createElement('a');
-  anchor.setAttribute(
-    'href',
-    `data:text/plain;charset=utf-8,${encodeURIComponent(output)}`
-  );
-  anchor.setAttribute('download', 'output.txt');
-
-  anchor.style.display = 'none';
-  document.body.appendChild(anchor);
-  anchor.click();
-  document.body.removeChild(anchor);
-}
-
 export const CompileOutputPane = () => {
   const output = useSelector<AppState, ResultState['output']>(
     state => state.result.output
@@ -62,6 +34,7 @@ export const CompileOutputPane = () => {
   return (
     <Container>
       <OutputToolbarComponent
+        showTryMichelson={true}
         onCopy={() => copyOutput(preRef.current)}
         onDownload={() => downloadOutput(output)}
       ></OutputToolbarComponent>
diff --git a/tools/webide/packages/client/src/components/output/generate-command-output-pane.tsx b/tools/webide/packages/client/src/components/output/generate-command-output-pane.tsx
new file mode 100644
index 000000000..5dd714375
--- /dev/null
+++ b/tools/webide/packages/client/src/components/output/generate-command-output-pane.tsx
@@ -0,0 +1,45 @@
+import React, { useRef } from 'react';
+import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+
+import { AppState } from '../../redux/app';
+import { ResultState } from '../../redux/result';
+import { OutputToolbarComponent } from './output-toolbar';
+import { copyOutput, downloadOutput } from './utils';
+
+const Container = styled.div<{ visible?: boolean }>`
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+`;
+
+const Output = styled.div`
+  flex: 1;
+  padding: 0.5em;
+  display: flex;
+  overflow: auto;
+`;
+
+const Pre = styled.pre`
+  margin: 0;
+`;
+
+export const GenerateCommandOutputPane = () => {
+  const output = useSelector<AppState, ResultState['output']>(
+    state => state.result.output
+  );
+
+  const preRef = useRef<HTMLPreElement>(null);
+
+  return (
+    <Container>
+      <OutputToolbarComponent
+        onCopy={() => copyOutput(preRef.current)}
+        onDownload={() => downloadOutput(output)}
+      ></OutputToolbarComponent>
+      <Output id="output">
+        <Pre ref={preRef}>{output}</Pre>
+      </Output>
+    </Container>
+  );
+};
diff --git a/tools/webide/packages/client/src/components/output/output-tab.tsx b/tools/webide/packages/client/src/components/output/output-tab.tsx
index 1f838aabf..5989b9f0e 100644
--- a/tools/webide/packages/client/src/components/output/output-tab.tsx
+++ b/tools/webide/packages/client/src/components/output/output-tab.tsx
@@ -8,6 +8,7 @@ import { ResultState } from '../../redux/result';
 import { Command } from '../../redux/types';
 import { CompileOutputPane } from './compile-output-pane';
 import { DeployOutputPane } from './deploy-output-pane';
+import { GenerateCommandOutputPane } from './generate-command-output-pane';
 import { Loading } from './loading';
 import { OutputPane } from './output-pane';
 
@@ -41,14 +42,21 @@ export const OutputTab = (props: {
   const loading = useSelector<AppState, LoadingState['loading']>(
     state => state.loading.loading
   );
+  const output = useSelector<AppState, ResultState['output']>(
+    state => state.result.output
+  );
 
   const renderResult = () => {
     if (loading) {
       return <Loading onCancel={props.onCancel}></Loading>;
+    } else if (!output) {
+      return <></>;
     } else if (command === Command.Compile) {
       return <CompileOutputPane></CompileOutputPane>;
     } else if (command === Command.Deploy) {
       return <DeployOutputPane></DeployOutputPane>;
+    } else if (command === Command.GenerateCommand) {
+      return <GenerateCommandOutputPane></GenerateCommandOutputPane>;
     }
 
     return <OutputPane></OutputPane>;
diff --git a/tools/webide/packages/client/src/components/output/output-toolbar.tsx b/tools/webide/packages/client/src/components/output/output-toolbar.tsx
index 0606b8d7a..3c064399b 100644
--- a/tools/webide/packages/client/src/components/output/output-toolbar.tsx
+++ b/tools/webide/packages/client/src/components/output/output-toolbar.tsx
@@ -24,6 +24,7 @@ const Link = styled.a`
 `;
 
 export const OutputToolbarComponent = (props: {
+  showTryMichelson?: boolean;
   onCopy?: () => void;
   onDownload?: () => void;
 }) => {
@@ -41,18 +42,20 @@ export const OutputToolbarComponent = (props: {
         <FontAwesomeIcon icon={faDownload}></FontAwesomeIcon>
         <Tooltip>Download</Tooltip>
       </Item>
-      <Divider></Divider>
-      <Item>
-        <Link
-          target="_blank"
-          rel="noopener noreferrer"
-          href={`https://try-michelson.tzalpha.net/?source=${encodeURIComponent(
-            output
-          )}`}
-        >
-          View in Try-Michelson IDE
-        </Link>
-      </Item>
+      {props.showTryMichelson && <Divider></Divider>}
+      {props.showTryMichelson && (
+        <Item>
+          <Link
+            target="_blank"
+            rel="noopener noreferrer"
+            href={`https://try-michelson.tzalpha.net/?source=${encodeURIComponent(
+              output
+            )}`}
+          >
+            View in Try-Michelson IDE
+          </Link>
+        </Item>
+      )}
     </Toolbar>
   );
 };
diff --git a/tools/webide/packages/client/src/components/output/utils.ts b/tools/webide/packages/client/src/components/output/utils.ts
new file mode 100644
index 000000000..79a5ede41
--- /dev/null
+++ b/tools/webide/packages/client/src/components/output/utils.ts
@@ -0,0 +1,28 @@
+export function copyOutput(el: HTMLElement | null) {
+  if (el) {
+    const range = document.createRange();
+    range.selectNodeContents(el);
+
+    const selection = window.getSelection();
+
+    if (selection) {
+      selection.removeAllRanges();
+      selection.addRange(range);
+      document.execCommand('copy');
+    }
+  }
+}
+
+export function downloadOutput(output: string) {
+  const anchor = document.createElement('a');
+  anchor.setAttribute(
+    'href',
+    `data:text/plain;charset=utf-8,${encodeURIComponent(output)}`
+  );
+  anchor.setAttribute('download', 'output.txt');
+
+  anchor.style.display = 'none';
+  document.body.appendChild(anchor);
+  anchor.click();
+  document.body.removeChild(anchor);
+}
diff --git a/tools/webide/packages/client/src/redux/actions/generate-command.ts b/tools/webide/packages/client/src/redux/actions/generate-command.ts
new file mode 100644
index 000000000..f5e2847e4
--- /dev/null
+++ b/tools/webide/packages/client/src/redux/actions/generate-command.ts
@@ -0,0 +1,112 @@
+import { Tezos } from '@taquito/taquito';
+import { Dispatch } from 'redux';
+import slugify from 'slugify';
+
+import { compileContract, compileStorage, getErrorMessage } from '../../services/api';
+import { AppState } from '../app';
+import { MichelsonFormat } from '../compile';
+import { DoneLoadingAction, UpdateLoadingAction } from '../loading';
+import { ChangeOutputAction } from '../result';
+import { Command } from '../types';
+import { CancellableAction } from './cancellable';
+
+const URL = 'https://api.tez.ie/keys/carthagenet/';
+const AUTHORIZATION_HEADER = 'Bearer ligo-ide';
+
+export async function fetchRandomPrivateKey(): Promise<string> {
+  const response = await fetch(URL, {
+    method: 'POST',
+    headers: { Authorization: AUTHORIZATION_HEADER }
+  });
+
+  return response.text();
+}
+
+export class GenerateCommandAction extends CancellableAction {
+  getAction() {
+    return async (dispatch: Dispatch, getState: () => AppState) => {
+      dispatch({ ...new UpdateLoadingAction('Compiling contract...') });
+
+      try {
+        const { editor, generateCommand } = getState();
+
+        const michelsonCodeJson = await compileContract(
+          editor.language,
+          editor.code,
+          generateCommand.entrypoint,
+          MichelsonFormat.Json
+        );
+
+        const michelsonCode = await compileContract(
+          editor.language,
+          editor.code,
+          generateCommand.entrypoint
+        );
+
+        if (this.isCancelled()) {
+          return;
+        }
+
+        dispatch({ ...new UpdateLoadingAction('Compiling storage...') });
+        const michelsonStorageJson = await compileStorage(
+          editor.language,
+          editor.code,
+          generateCommand.entrypoint,
+          generateCommand.storage,
+          MichelsonFormat.Json
+        );
+
+        const michelsonStorage = await compileStorage(
+          editor.language,
+          editor.code,
+          generateCommand.entrypoint,
+          generateCommand.storage
+        );
+
+        if (this.isCancelled()) {
+          return;
+        }
+
+        dispatch({ ...new UpdateLoadingAction('Estimating burn cap...') });
+
+        await Tezos.importKey(await fetchRandomPrivateKey());
+
+        const estimate = await Tezos.estimate.originate({
+          code: JSON.parse(michelsonCodeJson.result),
+          init: JSON.parse(michelsonStorageJson.result)
+        });
+
+        if (this.isCancelled()) {
+          return;
+        }
+
+        const title = slugify(editor.title).toLowerCase() || 'untitled';
+        const output = `tezos-client \\
+  ${generateCommand.command} \\
+  contract \\
+  ${title} \\
+  transferring 0 \\
+  from $YOUR_SOURCE_ACCOUNT \\
+  running '${michelsonCode.result.trim()}' \\
+  --init '${michelsonStorage.result.trim()}' \\
+  --burn-cap ${estimate.burnFeeMutez / 1000000}`;
+
+        dispatch({
+          ...new ChangeOutputAction(output, Command.GenerateCommand)
+        });
+      } catch (ex) {
+        if (this.isCancelled()) {
+          return;
+        }
+        dispatch({
+          ...new ChangeOutputAction(
+            `Error: ${getErrorMessage(ex)}`,
+            Command.GenerateCommand
+          )
+        });
+      }
+
+      dispatch({ ...new DoneLoadingAction() });
+    };
+  }
+}
diff --git a/tools/webide/packages/client/src/redux/app.ts b/tools/webide/packages/client/src/redux/app.ts
index e7829d8c9..304af9f9b 100644
--- a/tools/webide/packages/client/src/redux/app.ts
+++ b/tools/webide/packages/client/src/redux/app.ts
@@ -8,6 +8,7 @@ import editor, { EditorState } from './editor';
 import evaluateFunction, { EvaluateFunctionState } from './evaluate-function';
 import evaluateValue, { EvaluateValueState } from './evaluate-value';
 import examples, { ExamplesState } from './examples';
+import generateCommand, { GenerateCommandState } from './generate-command';
 import loading, { LoadingState } from './loading';
 import result, { ResultState } from './result';
 import share, { ShareState } from './share';
@@ -20,6 +21,7 @@ export interface AppState {
   deploy: DeployState;
   evaluateFunction: EvaluateFunctionState;
   evaluateValue: EvaluateValueState;
+  generateCommand: GenerateCommandState;
   result: ResultState;
   command: CommandState;
   examples: ExamplesState;
@@ -34,6 +36,7 @@ export default combineReducers({
   deploy,
   evaluateFunction,
   evaluateValue,
+  generateCommand,
   result,
   command,
   examples,
diff --git a/tools/webide/packages/client/src/redux/generate-command.ts b/tools/webide/packages/client/src/redux/generate-command.ts
new file mode 100644
index 000000000..dadd00163
--- /dev/null
+++ b/tools/webide/packages/client/src/redux/generate-command.ts
@@ -0,0 +1,81 @@
+import { Tool, ToolCommand } from './types';
+
+export enum ActionType {
+  ChangeTool = 'generate-command-change-tool',
+  ChangeCommand = 'generate-command-change-command',
+  ChangeEntrypoint = 'generate-command-change-entrypoint',
+  ChangeStorage = 'generate-command-change-storage'
+}
+
+export interface GenerateCommandState {
+  tool: Tool;
+  command: ToolCommand;
+  entrypoint: string;
+  originationAccount: string;
+  storage: string;
+  burnCap: number;
+}
+
+export class ChangeToolAction {
+  public readonly type = ActionType.ChangeTool;
+  constructor(public payload: GenerateCommandState['tool']) {}
+}
+
+export class ChangeCommandAction {
+  public readonly type = ActionType.ChangeCommand;
+  constructor(public payload: GenerateCommandState['command']) {}
+}
+
+export class ChangeEntrypointAction {
+  public readonly type = ActionType.ChangeEntrypoint;
+  constructor(public payload: GenerateCommandState['entrypoint']) {}
+}
+
+export class ChangeStorageAction {
+  public readonly type = ActionType.ChangeStorage;
+  constructor(public payload: GenerateCommandState['storage']) {}
+}
+
+type Action =
+  | ChangeToolAction
+  | ChangeCommandAction
+  | ChangeEntrypointAction
+  | ChangeStorageAction;
+
+const DEFAULT_STATE: GenerateCommandState = {
+  tool: Tool.TezosClient,
+  command: ToolCommand.Originate,
+  entrypoint: '',
+  storage: '',
+  originationAccount: '',
+  burnCap: 0
+};
+
+export default (
+  state = DEFAULT_STATE,
+  action: Action
+): GenerateCommandState => {
+  switch (action.type) {
+    case ActionType.ChangeTool:
+      return {
+        ...state,
+        tool: action.payload
+      };
+    case ActionType.ChangeCommand:
+      return {
+        ...state,
+        command: action.payload
+      };
+    case ActionType.ChangeEntrypoint:
+      return {
+        ...state,
+        entrypoint: action.payload
+      };
+    case ActionType.ChangeStorage:
+      return {
+        ...state,
+        storage: action.payload
+      };
+  }
+  return state;
+};
diff --git a/tools/webide/packages/client/src/redux/types.ts b/tools/webide/packages/client/src/redux/types.ts
index 29484403f..3aab55c08 100644
--- a/tools/webide/packages/client/src/redux/types.ts
+++ b/tools/webide/packages/client/src/redux/types.ts
@@ -9,5 +9,14 @@ export enum Command {
   DryRun = 'dry-run',
   EvaluateValue = 'evaluate-value',
   EvaluateFunction = 'evaluate-function',
-  Deploy = 'deploy'
+  Deploy = 'deploy',
+  GenerateCommand = 'generate-command'
+}
+
+export enum Tool {
+  TezosClient = 'tezos-client'
+}
+
+export enum ToolCommand {
+  Originate = 'originate'
 }
diff --git a/tools/webide/packages/client/src/services/api.ts b/tools/webide/packages/client/src/services/api.ts
index 39defca87..128c3ff94 100644
--- a/tools/webide/packages/client/src/services/api.ts
+++ b/tools/webide/packages/client/src/services/api.ts
@@ -43,6 +43,9 @@ export async function compileStorage(
   storage: string,
   format?: string
 ) {
+  // For whatever reason, storage set by examples is not treated as a string. So we convert it here.
+  storage = `${storage}`;
+
   const response = await axios.post('/api/compile-storage', {
     syntax,
     code,
diff --git a/tools/webide/packages/server/src/handlers/compile-storage.ts b/tools/webide/packages/server/src/handlers/compile-storage.ts
new file mode 100644
index 000000000..f0cc1a12b
--- /dev/null
+++ b/tools/webide/packages/server/src/handlers/compile-storage.ts
@@ -0,0 +1,52 @@
+import joi from '@hapi/joi';
+import { Request, Response } from 'express';
+
+import { CompilerError, LigoCompiler } from '../ligo-compiler';
+import { logger } from '../logger';
+
+interface CompileBody {
+  syntax: string;
+  code: string;
+  entrypoint: string;
+  storage: string;
+  format?: string;
+}
+
+const validateRequest = (body: any): { value: CompileBody; error: any } => {
+  return joi
+    .object({
+      syntax: joi.string().required(),
+      code: joi.string().required(),
+      entrypoint: joi.string().required(),
+      storage: joi.string().required(),
+      format: joi.string().optional()
+    })
+    .validate(body);
+};
+
+export async function compileStorageHandler(req: Request, res: Response) {
+  const { error, value: body } = validateRequest(req.body);
+
+  if (error) {
+    res.status(400).json({ error: error.message });
+  } else {
+    try {
+      const michelsonStorage = await new LigoCompiler().compileStorage(
+        body.syntax,
+        body.code,
+        body.entrypoint,
+        body.format || 'text',
+        body.storage
+      );
+
+      res.send({ result: michelsonStorage });
+    } catch (ex) {
+      if (ex instanceof CompilerError) {
+        res.status(400).json({ error: ex.message });
+      } else {
+        logger.error(ex);
+        res.sendStatus(500);
+      }
+    }
+  }
+}
diff --git a/tools/webide/packages/server/src/index.ts b/tools/webide/packages/server/src/index.ts
index 642ec46f0..41e4678ba 100644
--- a/tools/webide/packages/server/src/index.ts
+++ b/tools/webide/packages/server/src/index.ts
@@ -4,6 +4,7 @@ import { dirname, join } from 'path';
 
 import { compileContractHandler } from './handlers/compile-contract';
 import { compileExpressionHandler } from './handlers/compile-expression';
+import { compileStorageHandler } from './handlers/compile-storage';
 import { deployHandler } from './handlers/deploy';
 import { dryRunHandler } from './handlers/dry-run';
 import { evaluateValueHandler } from './handlers/evaluate-value';
@@ -51,6 +52,7 @@ app.get(
 );
 app.post('/api/compile-contract', compileContractHandler);
 app.post('/api/compile-expression', compileExpressionHandler);
+app.post('/api/compile-storage', compileStorageHandler);
 app.post('/api/dry-run', dryRunHandler);
 app.post('/api/share', shareHandler);
 app.post('/api/evaluate-value', evaluateValueHandler);
diff --git a/tools/webide/yarn.lock b/tools/webide/yarn.lock
index 9bc7ff8c1..c3d792c78 100644
--- a/tools/webide/yarn.lock
+++ b/tools/webide/yarn.lock
@@ -10706,6 +10706,11 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slugify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.0.tgz#c9557c653c54b0c7f7a8e786ef3431add676d2cb"
+  integrity sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==
+
 snakeize@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d"

From 78ae53491342df04f4c5c24056ec3afc6ca34631 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Fri, 13 Mar 2020 15:28:24 +0100
Subject: [PATCH 30/43] Add NotFound component to fix build. Yay, docusaurus...

---
 gitlab-pages/website/src/theme/NotFound.js | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 gitlab-pages/website/src/theme/NotFound.js

diff --git a/gitlab-pages/website/src/theme/NotFound.js b/gitlab-pages/website/src/theme/NotFound.js
new file mode 100644
index 000000000..955f51e2b
--- /dev/null
+++ b/gitlab-pages/website/src/theme/NotFound.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import Layout from '@theme/Layout';
+
+function NotFound() {
+  return (
+    <Layout title="Page Not Found">
+      <div className="container margin-vert--xl">
+        <div className="row">
+          <div className="col col--6 col--offset-3">
+            <h1 className="hero__title">Page Not Found</h1>
+            <p>We could not find what you were looking for.</p>
+            <p>
+              Please contact the owner of the site that linked you to the
+              original URL and let them know their link is broken.
+            </p>
+          </div>
+        </div>
+      </div>
+    </Layout>
+  );
+}
+
+export default NotFound;

From 97a85766d333d592c34ced3d046dba371b60ea1a Mon Sep 17 00:00:00 2001
From: Lesenechal Remi <lesenechal.remi@gmail.com>
Date: Thu, 12 Mar 2020 20:16:50 +0100
Subject: [PATCH 31/43] add a flag to disable michelson typechecking in
 compile-contract

---
 src/bin/cli.ml                     | 13 ++++++++++---
 src/bin/expect_tests/help_tests.ml |  4 ++++
 src/main/compile/of_michelson.ml   | 27 +++++++++++++++------------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/bin/cli.ml b/src/bin/cli.ml
index a35e5d91c..ad36e987c 100644
--- a/src/bin/cli.ml
+++ b/src/bin/cli.ml
@@ -94,6 +94,13 @@ let source =
     info ~docv ~doc ["source"] in
   value @@ opt (some string) None info
 
+let disable_michelson_typechecking =
+  let open Arg in
+  let info =
+    let doc = "disable Michelson typecking, this might produce ill-typed Michelson code." in
+    info ~doc ["disable-michelson-typechecking"] in
+  value @@ flag info
+
 let predecessor_timestamp =
   let open Arg in
   let info =
@@ -131,17 +138,17 @@ module Uncompile = Ligo.Uncompile
 module Run = Ligo.Run.Of_michelson
 
 let compile_file =
-  let f source_file entry_point syntax display_format michelson_format =
+  let f source_file entry_point syntax display_format disable_typecheck michelson_format =
     toplevel ~display_format @@
     let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
     let%bind typed,_    = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     let%bind michelson  = Compile.Of_mini_c.aggregate_and_compile_contract mini_c entry_point in
-    let%bind contract   = Compile.Of_michelson.build_contract michelson in
+    let%bind contract   = Compile.Of_michelson.build_contract ~disable_typecheck michelson in
     ok @@ Format.asprintf "%a\n" (Main.Display.michelson_pp michelson_format) contract
   in
   let term =
-    Term.(const f $ source_file 0 $ entry_point 1 $ syntax $ display_format $ michelson_code_format) in
+    Term.(const f $ source_file 0 $ entry_point 1 $ syntax $ display_format $ disable_michelson_typechecking $ michelson_code_format) in
   let cmdname = "compile-contract" in
   let doc = "Subcommand: Compile a contract." in
   (Term.ret term , Term.info ~doc cmdname)
diff --git a/src/bin/expect_tests/help_tests.ml b/src/bin/expect_tests/help_tests.ml
index f13b5c078..d1028bfab 100644
--- a/src/bin/expect_tests/help_tests.ml
+++ b/src/bin/expect_tests/help_tests.ml
@@ -176,6 +176,10 @@ let%expect_test _ =
                SOURCE_FILE is the path to the smart contract file.
 
     OPTIONS
+           --disable-michelson-typechecking
+               disable Michelson typecking, this might produce ill-typed
+               Michelson code.
+
            --format=DISPLAY_FORMAT, --display-format=DISPLAY_FORMAT
            (absent=human-readable)
                DISPLAY_FORMAT is the format that will be used by the CLI.
diff --git a/src/main/compile/of_michelson.ml b/src/main/compile/of_michelson.ml
index 3602a495e..93213152a 100644
--- a/src/main/compile/of_michelson.ml
+++ b/src/main/compile/of_michelson.ml
@@ -32,8 +32,8 @@ module Errors = struct
     error title_type_check_msg message
 end
 
-let build_contract : Compiler.compiled_expression -> Michelson.michelson result =
-  fun compiled ->
+let build_contract : ?disable_typecheck:bool -> Compiler.compiled_expression -> Michelson.michelson result =
+  fun ?(disable_typecheck= false) compiled ->
   let%bind ((Ex_ty _param_ty),(Ex_ty _storage_ty)) = Self_michelson.fetch_contract_inputs compiled.expr_ty in
   let%bind param_michelson =
     Trace.trace_tzresult_lwt (simple_error "Could not unparse parameter") @@
@@ -42,16 +42,19 @@ let build_contract : Compiler.compiled_expression -> Michelson.michelson result
     Trace.trace_tzresult_lwt (simple_error "Could not unparse storage") @@
     Proto_alpha_utils.Memory_proto_alpha.unparse_ty_michelson _storage_ty in
   let contract = Michelson.contract param_michelson storage_michelson compiled.expr in
-  let%bind res =
-    Trace.trace_tzresult_lwt (simple_error "Could not typecheck the code") @@
-    Proto_alpha_utils.Memory_proto_alpha.typecheck_contract contract in
-  match res with
-  | Type_checked  -> ok contract
-  | Err_parameter -> fail @@ Errors.bad_parameter contract ()
-  | Err_storage   -> fail @@ Errors.bad_storage contract ()
-  | Err_contract  -> fail @@ Errors.bad_contract contract ()
-  | Err_gas       -> fail @@ Errors.ran_out_of_gas ()
-  | Err_unknown   -> fail @@ Errors.unknown ()
+  if disable_typecheck then
+    ok contract
+  else
+    let%bind res =
+      Trace.trace_tzresult_lwt (simple_error "Could not typecheck the code") @@
+      Proto_alpha_utils.Memory_proto_alpha.typecheck_contract contract in
+    match res with
+    | Type_checked  -> ok contract
+    | Err_parameter -> fail @@ Errors.bad_parameter contract ()
+    | Err_storage   -> fail @@ Errors.bad_storage contract ()
+    | Err_contract  -> fail @@ Errors.bad_contract contract ()
+    | Err_gas       -> fail @@ Errors.ran_out_of_gas ()
+    | Err_unknown   -> fail @@ Errors.unknown ()
 
 type check_type = Check_parameter | Check_storage
 let assert_equal_contract_type : check_type -> Compiler.compiled_expression -> Compiler.compiled_expression -> unit result =

From 16a2355294ee5fca955ac53b2f1a107f62486e50 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Mon, 16 Mar 2020 22:30:28 +0100
Subject: [PATCH 32/43] Remove empty lines.

---
 gitlab-pages/docs/reference/big_map.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gitlab-pages/docs/reference/big_map.md b/gitlab-pages/docs/reference/big_map.md
index 956752427..c122e0270 100644
--- a/gitlab-pages/docs/reference/big_map.md
+++ b/gitlab-pages/docs/reference/big_map.md
@@ -12,12 +12,9 @@ A lazily deserialized map that's intended to store large amounts of data.
 
 The gast costs of deserialized maps are higher than standard maps as data is lazily deserialized.
 
-
 <SyntaxTitle syntax="pascaligo">
 type big_map (key, value)
 </SyntaxTitle>
-
-
 <SyntaxTitle syntax="cameligo">
 type ('key, 'value) big_map
 </SyntaxTitle>

From 78ae61c5e0fac372051a3f331d809f6ed0623c2c Mon Sep 17 00:00:00 2001
From: Sander <sandermail@gmail.com>
Date: Tue, 17 Mar 2020 15:38:41 +0000
Subject: [PATCH 33/43] Add remaining API docs

---
 gitlab-pages/docs/reference/big_map.md |  17 +-
 gitlab-pages/docs/reference/bitwise.md |  69 ++++++
 gitlab-pages/docs/reference/bytes.md   |  91 +++++--
 gitlab-pages/docs/reference/crypto.md  | 118 +++++++--
 gitlab-pages/docs/reference/current.md | 322 ++++++++++++++++++++++--
 gitlab-pages/docs/reference/list.md    | 211 +++++++---------
 gitlab-pages/docs/reference/map.md     | 330 +++++++++++++++----------
 gitlab-pages/docs/reference/set.md     | 217 ++++++++--------
 gitlab-pages/docs/reference/string.md  | 111 +++++++--
 gitlab-pages/website/sidebars.json     |  13 +-
 src/passes/operators/operators.ml      |   4 +-
 11 files changed, 1056 insertions(+), 447 deletions(-)
 create mode 100644 gitlab-pages/docs/reference/bitwise.md

diff --git a/gitlab-pages/docs/reference/big_map.md b/gitlab-pages/docs/reference/big_map.md
index c122e0270..e20bdc48c 100644
--- a/gitlab-pages/docs/reference/big_map.md
+++ b/gitlab-pages/docs/reference/big_map.md
@@ -13,7 +13,7 @@ A lazily deserialized map that's intended to store large amounts of data.
 The gast costs of deserialized maps are higher than standard maps as data is lazily deserialized.
 
 <SyntaxTitle syntax="pascaligo">
-type big_map (key, value)
+type big_map ('key, 'value)
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 type ('key, 'value) big_map
@@ -45,6 +45,7 @@ type register = (address, move) big_map
 
 </Syntax>
 <Syntax syntax="reasonligo">
+
 The type of a big map from values of type `key` to
 values of type `value` is `big_map (key, value)`.
 
@@ -56,7 +57,7 @@ type register = big_map (address, move);
 </Syntax>
 
 <SyntaxTitle syntax="pascaligo">
-function empty : big_map (key, value)
+function empty : big_map ('key, 'value)
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val empty : ('key, 'value) big_map
@@ -97,7 +98,7 @@ let empty : register = Big_map.empty
 
 
 <SyntaxTitle syntax="pascaligo">
-function literal : list (key * value) -> big_map (key, value) 
+function literal : list ('key * 'value) -> big_map ('key, 'value) 
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val literal : ('key * 'value) list -> ('key, 'value) big_map
@@ -149,7 +150,7 @@ let moves : register =
 </Syntax>
 
 <SyntaxTitle syntax="pascaligo">
-function find_opt : key -> big_map (key, value) -> option value
+function find_opt : 'key -> big_map ('key, 'value) -> option 'value
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val find_opt : 'key -> ('key, 'value) big_map -> 'value option
@@ -197,7 +198,7 @@ let my_balance : option (move) =
 </Syntax>
 
 <SyntaxTitle syntax="pascaligo">
-function update : key -> option value -> big_map (key, value) -> big_map (key, value)
+function update : 'key -> option 'value -> big_map ('key, 'value) -> big_map ('key, 'value)
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val update: 'key -> 'value option -> ('key, 'value) big_map -> ('key, 'value) big_map
@@ -262,7 +263,7 @@ let updated_map : register =
 </Syntax>
 
 <SyntaxTitle syntax="pascaligo">
-function add : key -> value -> big_map (key, value) -> big_map (key, value)
+function add : 'key -> 'value -> big_map ('key, 'value) -> big_map ('key, 'value)
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val add : 'key -> 'value -> ('key, 'value) big_map  -> ('key, 'value) big_map
@@ -298,13 +299,13 @@ let add = (m: register): register =>
 
 
 <SyntaxTitle syntax="pascaligo">
-function remove: key -> big_map (key, value) -> big_map (key, value)
+function remove: 'key -> big_map ('key, 'value) -> big_map ('key, 'value)
 </SyntaxTitle>
 <SyntaxTitle syntax="cameligo">
 val remove: 'key -> ('key, 'value) big_map -> ('key, 'value) big_map
 </SyntaxTitle>
 <SyntaxTitle syntax="reasonligo">
-let remove: (key, big_map ('key, 'value)) => big_map ('key, 'value)
+let remove: ('key, big_map ('key, 'value)) => big_map ('key, 'value)
 </SyntaxTitle>
 
 <Syntax syntax="pascaligo">
diff --git a/gitlab-pages/docs/reference/bitwise.md b/gitlab-pages/docs/reference/bitwise.md
new file mode 100644
index 000000000..85d6bde86
--- /dev/null
+++ b/gitlab-pages/docs/reference/bitwise.md
@@ -0,0 +1,69 @@
+---
+id: bitwise-reference
+title: Bitwise
+description: Operations on bytes
+hide_table_of_contents: true
+---
+
+import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
+
+<SyntaxTitle syntax="pascaligo">
+function and : nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val and :  nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let and: (nat, nat) -> nat
+</SyntaxTitle>
+
+A bitwise `and` operation.
+
+<SyntaxTitle syntax="pascaligo">
+function or : nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val or :  nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let or: (nat, nat) -> nat
+</SyntaxTitle>
+
+A bitwise `or` operation.
+
+<SyntaxTitle syntax="pascaligo">
+function xor : nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val xor :  nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let xor: (nat, nat) -> nat
+</SyntaxTitle>
+
+A bitwise `xor` operation.
+
+<SyntaxTitle syntax="pascaligo">
+function shift_left : nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val shift_left :  nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let shift_left: (nat, nat) -> nat
+</SyntaxTitle>
+
+A bitwise shift left operation.
+
+<SyntaxTitle syntax="pascaligo">
+function shift_right : nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val shift_right :  nat -> nat -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let shift_right: (nat, nat) -> nat
+</SyntaxTitle>
+
+A bitwise shift right operation.
diff --git a/gitlab-pages/docs/reference/bytes.md b/gitlab-pages/docs/reference/bytes.md
index dc8dc1aec..68e61d8cd 100644
--- a/gitlab-pages/docs/reference/bytes.md
+++ b/gitlab-pages/docs/reference/bytes.md
@@ -1,21 +1,43 @@
 ---
 id: bytes-reference
-title: Bytes — Manipulate bytes data
+title: Bytes
+description: Operations on bytes
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-## Bytes.concat(b1: bytes, b2: bytes) : bytes
+<SyntaxTitle syntax="pascaligo">
+type bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type bytes
+</SyntaxTitle>
+
+<SyntaxTitle syntax="pascaligo">
+function concat : bytes -> bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val concat : bytes -> bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let concat: (bytes, bytes) => bytes
+</SyntaxTitle>
 
 Concatenate together two `bytes` arguments and return the result.
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function concat_op (const s : bytes) : bytes is
-  begin skip end with bytes_concat(s , 0x7070)
+function concat_op (const s : bytes) : bytes is Bytes.concat(s , 0x7070)
 ```
 
+> Note that `bytes_concat` is *deprecated*. 
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -33,41 +55,58 @@ let concat_op = (s: bytes): bytes => Bytes.concat(s, 0x7070);
 
 </Syntax>
 
-## Bytes.slice(pos1: nat, pos2: nat, data: bytes) : bytes
+<SyntaxTitle syntax="pascaligo">
+function sub : nat -> nat -> bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val sub : nat -> nat -> bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let sub : (nat, nat, bytes) => bytes
+</SyntaxTitle>
 
 Extract the bytes between `pos1` and `pos2`. **Positions are zero indexed and
 inclusive**. For example if you gave the input "ff7a7aff" to the following:
 
-
-
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function slice_op (const s : bytes) : bytes is
-  begin skip end with bytes_slice(1n , 2n , s)
+function slice_op (const s : bytes) : bytes is Bytes.sub(1n , 2n , s)
 ```
 
+> Note that `bytes_slice` is *deprecated*.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
 ```cameligo
-let slice_op (s : bytes) : bytes =
-   Bytes.slice 1n 2n s
+let slice_op (s : bytes) : bytes = Bytes.sub 1n 2n s
 ```
 
+> Note that `Bytes.slice` is *deprecated*.
+
 </Syntax>
 <Syntax syntax="reasonligo">
 
 ```
-let slice_op = (s: bytes): bytes => Bytes.slice(1n, 2n, s);
+let slice_op = (s: bytes): bytes => Bytes.sub(1n, 2n, s);
 ```
 
+> Note that `Bytes.slice` is *deprecated*.
+
 </Syntax>
 
-
 It would return "7a7a" rather than "ff7a" or "ff" or "7a".
 
-## Bytes.pack(data: a') : bytes
+<SyntaxTitle syntax="pascaligo">
+function pack : 'a -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val pack : 'a -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let pack : 'a => bytes
+</SyntaxTitle>
 
 Converts Michelson data structures to a binary format for serialization.
 
@@ -105,10 +144,19 @@ let id_string = (p: string) : option(string) => {
 </Syntax>
 
 
-## Bytes.unpack(packed: bytes) : a'
+<SyntaxTitle syntax="pascaligo">
+function unpack : bytes -> option 'a
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val unpack : bytes -> 'a option
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let unpack: bytes => option('a)
+</SyntaxTitle>
 
-Reverses the result of using `unpack` on data, going from Michelson's binary
-serialization format to the `option` type annotated on the call.
+Reverses the result of using `pack` on data. 
+
+As the conversion might fail an option type is returned.
 
 > ⚠️ `PACK` and `UNPACK` are features of Michelson that are intended to be used by people that really know what they're doing. There are several failure cases (such as `UNPACK`ing a lambda from an untrusted source), most of which are beyond the scope of this document. Don't use these functions without doing your homework first.
 
@@ -143,3 +191,12 @@ let id_string = (p: string) : option(string) => {
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function length : bytes -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val length : bytes -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let length: bytes => nat
+</SyntaxTitle>
diff --git a/gitlab-pages/docs/reference/crypto.md b/gitlab-pages/docs/reference/crypto.md
index 49f5a9f02..ba8d146fd 100644
--- a/gitlab-pages/docs/reference/crypto.md
+++ b/gitlab-pages/docs/reference/crypto.md
@@ -1,11 +1,58 @@
 ---
 id: crypto-reference
-title: Crypto — Cryptographic functions
+title: Crypto
+description: Cryptographic operations
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-## Crypto.blake2b(data: bytes): bytes
+<SyntaxTitle syntax="pascaligo">
+type key
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type key
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type key
+</SyntaxTitle>
+
+A public cryptographic key.
+
+<SyntaxTitle syntax="pascaligo">
+type key_hash
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type key_hash
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type key_hash
+</SyntaxTitle>
+
+The hash of a public cryptographic key.
+
+<SyntaxTitle syntax="pascaligo">
+type signature
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type signature
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type signature
+</SyntaxTitle>
+
+A cryptographic signature.
+
+<SyntaxTitle syntax="pascaligo">
+function blake2b : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val blake2b : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let blake2b: bytes => bytes
+</SyntaxTitle>
 
 Runs the [blake2b hash algorithm](https://en.wikipedia.org/wiki/BLAKE_(hash_function)#BLAKE2)
 over the given `bytes` data and returns a `bytes` representing the hash.
@@ -15,9 +62,11 @@ over the given `bytes` data and returns a `bytes` representing the hash.
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function hasherman_blake (const s: bytes) : bytes is blake2b(s)
+function hasherman_blake (const s: bytes) : bytes is Crypto.blake2b(s)
 ```
 
+> Note that `blake2b` is *deprecated*. Please use `Crypto.blake2b`.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -25,6 +74,8 @@ function hasherman_blake (const s: bytes) : bytes is blake2b(s)
 let hasherman_blake (s: bytes) : bytes = Crypto.blake2b s
 ```
 
+
+
 </Syntax>
 <Syntax syntax="reasonligo">
 
@@ -34,8 +85,15 @@ let hasherman_blake = (s: bytes) => Crypto.blake2b(s);
 
 </Syntax>
 
-
-## Crypto.sha256(data: bytes) : bytes
+<SyntaxTitle syntax="pascaligo">
+function sha256 : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val sha256 : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let sha256: bytes => bytes
+</SyntaxTitle>
 
 Runs the [sha256 hash algorithm](https://en.wikipedia.org/wiki/SHA-2) over the given
 `bytes` data and returns a `bytes` representing the hash.
@@ -45,10 +103,11 @@ Runs the [sha256 hash algorithm](https://en.wikipedia.org/wiki/SHA-2) over the g
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function hasherman (const s : bytes) : bytes is
-  begin skip end with sha_256(s)
+function hasherman (const s : bytes) : bytes is Crypto.sha256(s)
 ```
 
+> Note that `sha_256` is *deprecated*. Please use `Crypto.sha256`.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -66,8 +125,15 @@ let hasherman = (s: bytes): bytes => Crypto.sha256(s);
 
 </Syntax>
 
-
-## Crypto.sha512(data: bytes) : bytes
+<SyntaxTitle syntax="pascaligo">
+function sha512 : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val sha512 : bytes -> bytes
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let sha512: bytes => bytes
+</SyntaxTitle>
 
 Runs the [sha512 hash algorithm](https://en.wikipedia.org/wiki/SHA-2) over the given
 `bytes` data and returns a `bytes` representing the hash.
@@ -77,9 +143,11 @@ Runs the [sha512 hash algorithm](https://en.wikipedia.org/wiki/SHA-2) over the g
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function hasherman512 (const s: bytes) : bytes is sha_512(s)
+function hasherman512 (const s: bytes) : bytes is Crypto.sha512(s)
 ```
 
+> Note that `sha_512` is *deprecated*.  Please use `Crypto.sha512`.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -96,8 +164,15 @@ let hasherman512 = (s: bytes) => Crypto.sha512(s);
 
 </Syntax>
 
-
-## Crypto.hash_key(k: key) : key_hash
+<SyntaxTitle syntax="pascaligo">
+function hash_key : key -> key_hash
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val hash_key : key -> key_hash
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let hash_key: key => key_hash
+</SyntaxTitle>
 
 Hashes a key for easy comparison and storage.
 
@@ -108,11 +183,13 @@ Hashes a key for easy comparison and storage.
 ```pascaligo
 function check_hash_key (const kh1 : key_hash; const k2 : key) : bool * key_hash is block {
   var ret : bool := False ;
-  var kh2 : key_hash := crypto_hash_key(k2) ;
+  var kh2 : key_hash := Crypto.hash_key(k2) ;
   if kh1 = kh2 then ret := True else skip; 
 } with (ret, kh2)
 ```
 
+> Note that `hash_key` is *deprecated*. Please use `Crypto.hash_key`.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -141,8 +218,15 @@ let check_hash_key = ((kh1, k2): (key_hash, key)) : (bool, key_hash) => {
 
 </Syntax>
 
-
-## Crypto.check(pk: key, signed: signature, data: bytes) : bool
+<SyntaxTitle syntax="pascaligo">
+function check : key -> signature -> bytes -> bool
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val check : key -> signature -> bytes -> bool
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let check: (key, signature, bytes) => bool
+</SyntaxTitle>
 
 Check that a message has been signed by a particular key.
 
@@ -157,9 +241,11 @@ function check_signature
     (const pk: key;
      const signed: signature;
      const msg: bytes) : bool
-  is crypto_check(pk, signed, msg)
+  is Crypto.check(pk, signed, msg)
 ```
 
+> Note that `crypto_check` is *deprecated*. Please use `Crypto.check`.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
diff --git a/gitlab-pages/docs/reference/current.md b/gitlab-pages/docs/reference/current.md
index 642bbb6fe..56c719630 100644
--- a/gitlab-pages/docs/reference/current.md
+++ b/gitlab-pages/docs/reference/current.md
@@ -1,11 +1,96 @@
 ---
 id: current-reference
-title: Tezos - Things relating to the current execution context
+title: Tezos
+description: General operations for Tezos
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-# Tezos.balance
+<SyntaxTitle syntax="pascaligo">
+type timestamp
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type timestamp
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type timestamp
+</SyntaxTitle>
+
+A date in the real world.
+
+<SyntaxTitle syntax="pascaligo">
+type mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type mutez
+</SyntaxTitle>
+
+A specific type for tokens.
+
+<SyntaxTitle syntax="pascaligo">
+type address
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type address
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type address
+</SyntaxTitle>
+
+An untyped address which can refer to a smart contract or account.
+
+<SyntaxTitle syntax="pascaligo">
+type contract('parameter)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type 'parameter contract
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type contract('parameter)
+</SyntaxTitle>
+
+A typed contract. 
+
+Use `unit` as `parameter` to indicate an implicit account. 
+
+<SyntaxTitle syntax="pascaligo">
+type operation
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type operation
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type operation
+</SyntaxTitle>
+
+An operation emitted by the contract
+
+<SyntaxTitle syntax="pascaligo">
+type chain_id
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type chain_id
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type chain_id
+</SyntaxTitle>
+
+The identifier of a chain, used to indicate test or main chains.
+
+<SyntaxTitle syntax="pascaligo">
+function balance : mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val balance : mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let balance: mutez
+</SyntaxTitle>
 
 Get the balance for the contract.
 
@@ -18,7 +103,7 @@ function main (const p : unit; const s: tez) : list (operation) * tez is
   ((nil : list (operation)), Tezos.balance)
 ```
 
-> Note that `balance` and `Current.balance` are *deprecated*.
+> Note that `balance` and `Current.balance` are *deprecated*. 
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -42,7 +127,15 @@ let main = ((p,s) : (unit, tez)) =>
 </Syntax>
 
 
-## Tezos.now
+<SyntaxTitle syntax="pascaligo">
+function now : timestamp
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val now : timestamp
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let now: timestamp
+</SyntaxTitle>
 
 Returns the current time as a [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
 
@@ -64,7 +157,7 @@ const some_date: timestamp = ("2000-01-01T10:10:10Z" : timestamp);
 const one_day_later: timestamp = some_date + one_day;
 ```
 
-> Note that `now` is *deprecated*.
+> Note that `now` is *deprecated*. Please use `Tezos.now`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -106,7 +199,7 @@ const one_day: int = 86_400;
 const in_24_hrs: timestamp = today - one_day;
 ```
 
-> Note that `now` is *deprecated*.
+> Note that `now` is *deprecated*. Please use `Tezos.now`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -145,7 +238,7 @@ for numbers
 const not_tommorow: bool = (Tezos.now = in_24_hrs)
 ```
 
-> Note that `now` is *deprecated*.
+> Note that `now` is *deprecated*. Please use `Tezos.now`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -169,7 +262,15 @@ let not_tomorrow: bool = (Tezos.now == in_24_hrs);
 
 
 
-## Amount
+<SyntaxTitle syntax="pascaligo">
+function amount : mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val amount : mutez
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let amount: mutez
+</SyntaxTitle>
 
 Get the amount of tez provided by the sender to complete this
 transaction.
@@ -207,7 +308,15 @@ let threshold = (p : unit) : int =>
 </Syntax>
 
 
-## Sender
+<SyntaxTitle syntax="pascaligo">
+function sender : address
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val sender : address
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let sender: address
+</SyntaxTitle>
 
 Get the address that initiated the current transaction.
 
@@ -219,7 +328,7 @@ Get the address that initiated the current transaction.
 function main (const p : unit) : address is Tezos.sender
 ```
 
-> Note that `sender` is *deprecated*.
+> Note that `sender` is *deprecated*. Please use `Tezos.sender`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -243,7 +352,15 @@ let main = (p : unit) : address => Tezos.sender;
 
 
 
-## Address
+<SyntaxTitle syntax="pascaligo">
+function address : contract 'a -> address
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val address : 'a contract -> address
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let address: contract('a) => address
+</SyntaxTitle>
 
 Get the address associated with a value of type `contract`.
 
@@ -257,7 +374,7 @@ function main (const p : key_hash) : address is block {
 } with Tezos.address(c)
 ```
 
-> Note that `implicit_account` and `address` are *deprecated*.
+> Note that `implicit_account` and `address` are *deprecated*. Please use `Tezos.implicit_account` and `Tezos.address` instead.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -287,7 +404,15 @@ let main = (p : key_hash) : address => {
 </Syntax>
 
 
-## Self Address
+<SyntaxTitle syntax="pascaligo">
+function self_address : address
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val self_address : address
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let self_address: address
+</SyntaxTitle>
 
 Get the address of the currently running contract.
 
@@ -299,7 +424,7 @@ Get the address of the currently running contract.
 function main (const p : unit) : address is Tezos.self_address
 ```
 
-> Note that `self_address` is *deprecated*.
+> Note that `self_address` is *deprecated*. Please use `Tezos.self_address`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -320,8 +445,15 @@ let main = (p : unit) : address => Tezos.self_address;
 > Note that `Current.self_address` is *deprecated*.
 
 </Syntax>
-
-## Self
+<SyntaxTitle syntax="pascaligo">
+function self : string -> contract 'a
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val self : string -> 'a contract
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let self: string => contract('a)
+</SyntaxTitle>
 
 Typecast the currently running contract with an entrypoint annotation.
 If your are using entrypoints: use "%bar" for constructor Bar
@@ -353,13 +485,21 @@ let main = (p: unit) : contract(unit) =>
 
 </Syntax>
 
-## Implicit Account
+<SyntaxTitle syntax="pascaligo">
+function implicit_account : key_hash -> contract 'a
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val implicit_account : key_hash -> 'a contract
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let implicit_account: key_hash => contract('a)
+</SyntaxTitle>
 
 Get the default contract associated with an on-chain key-pair. This
 contract does not execute code, instead it exists to receive tokens on
 behalf of a key's owner.
 
-
+See also: http://tezos.gitlab.io/user/glossary.html#implicit-account 
 
 <Syntax syntax="pascaligo">
 
@@ -368,7 +508,7 @@ function main (const kh: key_hash) : contract (unit) is
   Tezos.implicit_account (kh)
 ```
 
-> Note that `implicit_account` is *deprecated*.
+> Note that `implicit_account` is *deprecated*. Please use `Tezos.implicit_account`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -392,7 +532,15 @@ let main = (kh : key_hash): contract (unit) =>
 </Syntax>
 
 
-## Source
+<SyntaxTitle syntax="pascaligo">
+function source : address
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val source : address
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let source: address
+</SyntaxTitle>
 
 Get the _originator_ (address) of the current transaction. That is, if
 a chain of transactions led to the current execution get the address
@@ -426,7 +574,7 @@ current transaction.
 function main (const p: unit) : address is Tezos.source
 ```
 
-> Note that `source` is *deprecated*.
+> Note that `source` is *deprecated*. Please use `Tezos.source`.
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -449,7 +597,15 @@ let main = (p : unit) : address => Tezos.source;
 </Syntax>
 
 
-## Failwith
+<SyntaxTitle syntax="pascaligo">
+function failwith : string -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+function failwith : string -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+function failwith : string -> unit
+</SyntaxTitle>
 
 Cause the contract to fail with an error message.
 
@@ -485,3 +641,125 @@ let main = ((p,s) : (int, unit)) =>
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function chain_id : chain_id
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val chain_id : chain_id
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let chain_id: chain_id
+</SyntaxTitle>
+
+Get the identifier of the chain to distinguish between main and test chains.
+
+This is mainly intended to avoid replay attacks between the chains, and can currently
+only be used together with `Bytes.pack` and `Bytes.unpack`.
+
+<Syntax syntax="pascaligo">
+
+```pascaligo
+type storage is bytes
+
+function main (const ignore : unit; const storage: storage) : 
+  (list(operation) * storage) is block {
+  const packed : bytes = Bytes.pack (Tezos.chain_id);
+  if (storage =/= packed) then {
+   failwith("wrong chain")
+  } else
+    skip;
+} with ((nil: list(operation)), packed)
+```
+
+</Syntax>
+<Syntax syntax="cameligo">
+
+```cameligo
+type storage = bytes
+
+let main ((ignore, storage): (unit * storage)) =
+  let packed = Bytes.pack Tezos.chain_id in
+  if (storage <> packed) then
+    (failwith "wrong chain" : (operation list * storage))
+  else
+    (([]: operation list), (packed: storage))
+```
+
+</Syntax>
+<Syntax syntax="reasonligo">
+
+```reasonligo
+type storage = bytes;
+
+let main = ((ignore, storage): (unit, storage)) => {
+  let packed = Bytes.pack(Tezos.chain_id);
+  if (storage != packed) {
+    (failwith("wrong chain"): (list(operation), storage));
+  } else {
+    ([]: list(operation), packed);
+  }
+};
+```
+
+</Syntax>
+
+<SyntaxTitle syntax="pascaligo">
+function transaction : 'parameter -> mutez -> contract('parameter) -> operation
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val transaction : 'parameter -> mutez -> 'parameter contract -> operation
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let transaction: 'parameter -> mutez -> contract('parameter) -> operation
+</SyntaxTitle>
+
+Create a transaction to a contract or account. 
+
+To indicate an account, use `unit` as `parameter`.
+
+
+<SyntaxTitle syntax="pascaligo">
+function set_delegate : option(key_hash) -> operation
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val set_delegate : key_hash option -> operation
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let set_delegate: option(key_hash) => operation
+</SyntaxTitle>
+
+Create a delegation.
+
+See also: http://tezos.gitlab.io/user/glossary.html?highlight=delegate#delegate
+
+<SyntaxTitle syntax="pascaligo">
+function get_contract_opt : address -> option(contract('parameter))
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val get_contract_opt : address -> 'parameter contract option
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let get_contract_opt : address => option(contract('parameter))
+</SyntaxTitle>
+
+Get a contract from an address.
+
+When no contract is found or the contract doesn't match the type,  
+`None` is returned.
+
+<SyntaxTitle syntax="pascaligo">
+function get_entrypoint_opt : string -> address -> option(contract('parameter))
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+function get_entrypoint_opt : string -> address -> 'parameter contract option
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+function get_entrypoint_opt: (string, address) => option(contract('parameter))
+</SyntaxTitle>
+
+Get a contract from an address and entrypoint. 
+
+Entrypoints are written in the form of: `%entrypoint`.
+
+When no contract is found or the contract doesn't match the type,  
+`None` is returned.
diff --git a/gitlab-pages/docs/reference/list.md b/gitlab-pages/docs/reference/list.md
index cbded72e6..e85e5b543 100644
--- a/gitlab-pages/docs/reference/list.md
+++ b/gitlab-pages/docs/reference/list.md
@@ -1,96 +1,62 @@
 ---
 id: list-reference
-title: Lists — Linear Collections
+title: List
+description: List operations
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-Lists are linear collections of elements of the same type. Linear
-means that, in order to reach an element in a list, we must visit all
-the elements before (sequential access). Elements can be repeated, as
-only their order in the collection matters. The first element is
-called the *head*, and the sub-list after the head is called the
-*tail*. For those familiar with algorithmic data structure, you can
-think of a list a *stack*, where the top is written on the left.
+<SyntaxTitle syntax="pascaligo">
+type list ('t)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type 't list
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type list('t)
+</SyntaxTitle>
 
-# Defining Lists
+A sequence of elements of the same type.
 
+<SyntaxTitle syntax="pascaligo">
+function length : nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val length : nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let length: nat
+</SyntaxTitle>
 
-<Syntax syntax="pascaligo">
+Get the number of elements in a list.
 
-```pascaligo group=lists
-const empty_list : list (int) = nil // Or list []
-const my_list : list (int) = list [1; 2; 2] // The head is 1
-```
+<SyntaxTitle syntax="pascaligo">
+function size : nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val size : nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let size: nat
+</SyntaxTitle>
 
-</Syntax>
-<Syntax syntax="cameligo">
+Get the number of elements in a list.
 
-```cameligo group=lists
-let empty_list : int list = []
-let my_list : int list = [1; 2; 2] // The head is 1
-```
-
-</Syntax>
-<Syntax syntax="reasonligo">
-
-```reasonligo group=lists
-let empty_list : list (int) = [];
-let my_list : list (int) = [1, 2, 2]; // The head is 1
-```
-
-</Syntax>
-
-
-# Adding to Lists
-
-Lists can be augmented by adding an element before the head (or, in
-terms of stack, by *pushing an element on top*).
-
-
-
-<Syntax syntax="pascaligo">
-
-```pascaligo group=lists
-const larger_list : list (int) = 5 # my_list // [5;1;2;2]
-```
-
-</Syntax>
-<Syntax syntax="cameligo">
-
-```cameligo group=lists
-let larger_list : int list = 5 :: my_list // [5;1;2;2]
-```
-
-</Syntax>
-<Syntax syntax="reasonligo">
-
-```reasonligo group=lists
-let larger_list : list (int) = [5, ...my_list]; // [5,1,2,2]
-```
-
-</Syntax>
-
-
-
-# Functional Iteration over Lists
-
-A *functional iterator* is a function that traverses a data structure
-and calls in turn a given function over the elements of that structure
-to compute some value. Another approach is possible in PascaLIGO:
-*loops* (see the relevant section).
-
-There are three kinds of functional iterations over LIGO lists: the
-*iterated operation*, the *map operation* (not to be confused with the
-*map data structure*) and the *fold operation*.
-
-## Iterated Operation over Lists
-
-The first, the *iterated operation*, is an iteration over the list
-with a unit return value. It is useful to enforce certain invariants
-on the element of a list, or fail.
+Synonym for `List.length`.
 
+<SyntaxTitle syntax="pascaligo">
+function iter : ('a -> unit) -> list('a) -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val iter : ('a -> unit) -> 'a list -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let iter: (('a => unit), list('a)) => unit
+</SyntaxTitle>
 
+Iterate over items in a list.
 
 <Syntax syntax="pascaligo">
 
@@ -104,6 +70,8 @@ function iter_op (const l : list (int)) : unit is
 
 > Note that `list_iter` is *deprecated*.
 
+Alternatively it's also possible to use [loops](../language-basics/loops.md).
+
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -126,17 +94,23 @@ let iter_op = (l : list (int)) : unit => {
 </Syntax>
 
 
-## Mapped Operation over Lists
-
-We may want to change all the elements of a given list by applying to
-them a function. This is called a *map operation*, not to be confused
-with the map data structure.
-
+<SyntaxTitle syntax="pascaligo">
+function map : ('a -> 'b) -> list('a) -> list('b)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val map : ('a -> 'b) -> 'a list -> 'b list
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let map: (('a => 'b), list('a)) => list('b)
+</SyntaxTitle>
 
+Apply a function to items of a list to create a new list.
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=lists
+const larger_list: list(int) = list [1; 2; 3]
+
 function increment (const i : int): int is i + 1
 
 // Creates a new list with all elements incremented by 1
@@ -149,6 +123,8 @@ const plus_one : list (int) = List.map (increment, larger_list)
 <Syntax syntax="cameligo">
 
 ```cameligo group=lists
+let larger_list: int list = [1; 2; 3]
+
 let increment (i : int) : int = i + 1
 
 // Creates a new list with all elements incremented by 1
@@ -159,6 +135,8 @@ let plus_one : int list = List.map increment larger_list
 <Syntax syntax="reasonligo">
 
 ```reasonligo group=lists
+let larger_list: list(int) = [1, 2, 3];
+
 let increment = (i : int) : int => i + 1;
 
 // Creates a new list with all elements incremented by 1
@@ -167,22 +145,25 @@ let plus_one : list (int) = List.map (increment, larger_list);
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function fold : (('accumulator -> 'item -> 'accumulator) -> list('item) -> 'accumulator) -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val fold : ('accumulator -> 'item -> 'accumulator) -> 'item list -> 'accumulator -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let fold: ((('accumulator, 'item) => 'accumulator), list('item), 'accumulator) => 'accumulator
+</SyntaxTitle>
 
-
-## Folded Operation over Lists
-
-A *folded operation* is the most general of iterations. The folded
-function takes two arguments: an *accumulator* and the structure
-*element* at hand, with which it then produces a new accumulator. This
-enables having a partial result that becomes complete when the
-traversal of the data structure is over.
-
-
+[Fold over items in a list](../language-basics/sets-lists-tuples#folded-operation-over-lists);
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=lists
+const my_list: list(int) = list [1; 2; 3]
+
 function sum (const acc : int; const i : int): int is acc + i
+
 const sum_of_elements : int = List.fold (sum, my_list, 0)
 ```
 
@@ -192,7 +173,10 @@ const sum_of_elements : int = List.fold (sum, my_list, 0)
 <Syntax syntax="cameligo">
 
 ```cameligo group=lists
-let sum (acc, i: int * int) : int = acc + i
+let my_list : int list = [1; 2; 3]
+
+let sum (acc, i : int * int) : int = acc + i
+
 let sum_of_elements : int = List.fold sum my_list 0
 ```
 
@@ -200,40 +184,11 @@ let sum_of_elements : int = List.fold sum my_list 0
 <Syntax syntax="reasonligo">
 
 ```reasonligo group=lists
+let my_list : list(int) = [1, 2, 3];
+
 let sum = ((result, i): (int, int)): int => result + i;
+
 let sum_of_elements : int = List.fold (sum, my_list, 0);
 ```
 
 </Syntax>
-
-
-# List Length
-
-Get the number of elements in a list.
-
-
-
-<Syntax syntax="pascaligo">
-
-```pascaligo
-function size_of (const l : list (int)) : nat is List.length (l)
-```
-
-> Note that `size` is *deprecated*.
-
-</Syntax>
-<Syntax syntax="cameligo">
-
-```cameligo
-let size_of (l : int list) : nat = List.length l
-```
-
-</Syntax>
-<Syntax syntax="reasonligo">
-
-```reasonligo
-let size_of = (l : list (int)) : nat => List.length (l);
-```
-
-</Syntax>
-
diff --git a/gitlab-pages/docs/reference/map.md b/gitlab-pages/docs/reference/map.md
index b359380eb..bf26f6bcf 100644
--- a/gitlab-pages/docs/reference/map.md
+++ b/gitlab-pages/docs/reference/map.md
@@ -1,22 +1,28 @@
 ---
 id: map-reference
-title: Maps
+title: Map
+description: Map operations
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-*Maps* are a data structure which associate values of the same type to
-values of the same type. The former are called *key* and the latter
-*values*. Together they make up a *binding*. An additional requirement
-is that the type of the keys must be *comparable*, in the Michelson
-sense.
-
-# Declaring a Map
-
-
+<SyntaxTitle syntax="pascaligo">
+type map ('key, 'value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type map ('key, 'value)
+</SyntaxTitle>
 
 <Syntax syntax="pascaligo">
 
+The type of a map from values of type `key` to
+values of type `value` is `map (key, value)`.
+
 ```pascaligo group=maps
 type move is int * int
 type register is map (address, move)
@@ -25,6 +31,9 @@ type register is map (address, move)
 </Syntax>
 <Syntax syntax="cameligo">
 
+The type of a map from values of type `key` to values
+of type `value` is `(key, value) map`.
+
 ```cameligo group=maps
 type move = int * int
 type register = (address, move) map
@@ -33,6 +42,9 @@ type register = (address, move) map
 </Syntax>
 <Syntax syntax="reasonligo">
 
+The type of a map from values of type `key` to
+values of type `value` is `map (key, value)`.
+
 ```reasonligo group=maps
 type move = (int, int);
 type register = map (address, move);
@@ -40,13 +52,26 @@ type register = map (address, move);
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function empty : map ('key, 'value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val empty : ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let empty: map('key, 'value)
+</SyntaxTitle>
 
-# Creating an Empty Map
-
-
+Create an empty map.
 
 <Syntax syntax="pascaligo">
 
+```pascaligo group=maps
+const empty : register = Map.empty
+```
+
+Or
+
 ```pascaligo group=maps
 const empty : register = map []
 ```
@@ -68,16 +93,34 @@ let empty : register = Map.empty
 </Syntax>
 
 
-# Creating a Non-empty Map
+<SyntaxTitle syntax="pascaligo">
+function literal : list ('key * 'value) -> map ('key, 'value) 
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val literal : ('key * 'value) list -> ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let literal: list(('key, 'value)) => map('key, 'value)
+</SyntaxTitle>
 
+Create a non-empty map.
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=maps
 const moves : register =
+  Map.literal (list [
+    (("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address), (1,2));
+    (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (0,3))]);
+```
+
+Alternative way of creating an empty map:
+
+```pascaligo group=maps
+const moves_alternative : register =
   map [
     ("tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" : address) -> (1,2);
-    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)]
+    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) -> (0,3)];
 ```
 
 </Syntax>
@@ -103,14 +146,32 @@ let moves : register =
 </Syntax>
 
 
-# Accessing Map Bindings
+<SyntaxTitle syntax="pascaligo">
+function find_opt : 'key -> map ('key, 'value) -> option 'value
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val find_opt : 'key -> ('key, 'value) map -> 'value option
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let find_opt : ('key, map ('key, 'value)) => option ('value)
+</SyntaxTitle>
+
+Retrieve a (option) value from a map with the given key. Returns `None` if the 
+key is missing and the value otherwise.
 
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=maps
 const my_balance : option (move) =
-  moves [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address)]
+  Map.find_opt (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), moves)
+```
+
+Alternatively:
+
+```pascaligo group=maps
+const my_balance_alternative : option (move) =
+  moves [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address)];
 ```
 
 </Syntax>
@@ -126,67 +187,40 @@ let my_balance : move option =
 
 ```reasonligo group=maps
 let my_balance : option (move) =
-  Map.find_opt (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), moves);
+  Map.find_opt ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address, moves);
 ```
 
 </Syntax>
 
 
-Notice how the value we read is an optional value: this is to force
-the reader to account for a missing key in the map. This requires
-*pattern matching*.
-
+<SyntaxTitle syntax="pascaligo">
+function update : 'key -> option 'value -> map ('key, 'value) -> map ('key, 'value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val update: 'key -> 'value option -> ('key, 'value) map -> ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let update: ('key, option('value), map('key, 'value)) => map ('key, 'value)
+</SyntaxTitle>
 
+Note: when `None` is used as a value, the key and associated value is removed 
+from the map.
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=maps
-function force_access (const key : address; const moves : register) : move is
-  case moves[key] of
-    Some (move) -> move
-  | None -> (failwith ("No move.") : move)
-  end
+  const updated_map : register = Map.update(("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), Some (4,9), moves);
 ```
 
-</Syntax>
-<Syntax syntax="cameligo">
-
-```cameligo group=maps
-let force_access (key, moves : address * register) : move =
-  match Map.find_opt key moves with
-    Some move -> move
-  | None -> (failwith "No move." : move)
-```
-
-</Syntax>
-<Syntax syntax="reasonligo">
-
-```reasonligo group=maps
-let force_access = ((key, moves) : (address, register)) : move => {
-  switch (Map.find_opt (key, moves)) {
-  | Some (move) => move
-  | None => failwith ("No move.") : move
-  }
-};
-```
-
-</Syntax>
-
-
-# Updating a Map
-
-Given a map, we may want to add a new binding, remove one, or modify
-one by changing the value associated to an already existing key. All
-those operations are called *updates*.
-
-
-<Syntax syntax="pascaligo">
+Alternatively:
 
 ```pascaligo group=maps
-function assign (var m : register) : register is
+
+function update (var m : register) : register is
   block {
-    m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9)
+    m [("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address)] := (4,9);
   } with m
+  
 ```
 
 If multiple bindings need to be updated, PascaLIGO offers a *patch
@@ -206,14 +240,40 @@ function assignments (var m : register) : register is
 <Syntax syntax="cameligo">
 
 ```cameligo group=maps
-let assign (m : register) : register =
+let updated_map : register =
   Map.update
-    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) (Some (4,9)) m
+    ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address) (Some (4,9)) moves
 ```
-Notice the optional value `Some (4,9)` instead of `(4,9)`. If we had
-use `None` instead, that would have meant that the binding is removed.
 
-As a particular case, we can only add a key and its associated value.
+</Syntax>
+<Syntax syntax="reasonligo">
+
+```reasonligo group=maps
+let updated_map : register =
+  Map.update
+    (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), Some ((4,9)), moves);
+```
+
+</Syntax>
+
+
+<SyntaxTitle syntax="pascaligo">
+function add : 'key -> 'value -> map ('key, 'value) -> map ('key, 'value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val add : 'key -> 'value -> ('key, 'value) map  -> ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let add: ('key, 'value, map('key, 'value)) => map('key, 'value) 
+</SyntaxTitle>
+<Syntax syntax="pascaligo">
+
+```pascaligo group=maps
+const added_item : register = Map.add (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4, 9), moves)
+```
+
+</Syntax>
+<Syntax syntax="cameligo">
 
 ```cameligo group=maps
 let add (m : register) : register =
@@ -225,18 +285,7 @@ let add (m : register) : register =
 <Syntax syntax="reasonligo">
 
 ```reasonligo group=maps
-let assign = (m : register) : register =>
-  Map.update
-    (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), Some ((4,9)), m);
-```
-
-Notice the optional value `Some (4,9)` instead of `(4,9)`. If we had
-use `None` instead, that would have meant that the binding is removed.
-
-As a particular case, we can only add a key and its associated value.
-
-```reasonligo group=maps
-let add = (m : register) : register =>
+let add = (m: register): register =>
   Map.add
     (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" : address), (4,9), m);
 ```
@@ -244,57 +293,63 @@ let add = (m : register) : register =>
 </Syntax>
 
 
-To remove a binding from a map, we need its key.
-
-
+<SyntaxTitle syntax="pascaligo">
+function remove : 'key -> map ('key, 'value) -> map ('key, 'value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val remove : 'key -> ('key, 'value) map -> ('key, 'value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let remove: (key, map('key, 'value)) => map('key, 'value)
+</SyntaxTitle>
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=maps
-function delete (const key : address; var moves : register) : register is
+  const updated_map : register = 
+    Map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
+```
+
+Alternatively, the instruction `remove key from map m` removes the key
+`key` from the map `m`.
+
+```pascaligo group=maps
+function rem (var m : register) : register is
   block {
-    remove key from map moves
-  } with moves
+    remove ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address) from map moves
+  } with m
+
+const updated_map : register = rem (moves)
 ```
 
 </Syntax>
 <Syntax syntax="cameligo">
 
 ```cameligo group=maps
-let delete (key, moves : address * register) : register =
-  Map.remove key moves
+let updated_map : register =
+  Map.remove ("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address) moves
 ```
 
 </Syntax>
 <Syntax syntax="reasonligo">
 
 ```reasonligo group=maps
-let delete = ((key, moves) : (address, register)) : register =>
-  Map.remove (key, moves);
+let updated_map : register =
+  Map.remove (("tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN": address), moves)
 ```
 
 </Syntax>
 
 
-
-# Functional Iteration over Maps
-
-A *functional iterator* is a function that traverses a data structure
-and calls in turn a given function over the elements of that structure
-to compute some value. Another approach is possible in PascaLIGO:
-*loops* (see the relevant section).
-
-There are three kinds of functional iterations over LIGO maps: the
-*iterated operation*, the *map operation* (not to be confused with the
-*map data structure*) and the *fold operation*.
-
-## Iterated Operation over Maps
-
-The first, the *iterated operation*, is an iteration over the map with
-no return value: its only use is to produce side-effects. This can be
-useful if for example you would like to check that each value inside
-of a map is within a certain range, and fail with an error otherwise.
-
+<SyntaxTitle syntax="pascaligo">
+function iter : ((key, value) -> unit) -> map (key, value) -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val iter : (('key * 'value) -> unit) -> ('key, 'value) map -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let iter: ((('key, 'value)) => unit, map('key, 'value)) => unit
+</SyntaxTitle>
 
 
 <Syntax syntax="pascaligo">
@@ -330,14 +385,15 @@ let iter_op = (m : register) : unit => {
 
 </Syntax>
 
-
-## Map Operations over Maps
-
-We may want to change all the bindings of a map by applying to them a
-function. This is called a *map operation*, not to be confused with
-the map data structure. The predefined functional iterator
-implementing the map operation over maps is called `Map.map`.
-
+<SyntaxTitle syntax="pascaligo">
+function map : (('key, 'value) -> ('mapped_key, 'mapped_item)) -> map ('key, 'value) -> map ('mapped_key, 'mapped_value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val map : (('key * 'value) -> ('mapped_key * 'mapped_item)) -> (key, value) map  -> (mapped_key, mapped_value) map
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let map: ((('key, 'value)) => ('mapped_key, 'mapped_item), map(key, value)) => map(mapped_key, mapped_value)
+</SyntaxTitle>
 
 
 <Syntax syntax="pascaligo">
@@ -374,14 +430,15 @@ let map_op = (m : register) : register => {
 </Syntax>
 
 
-## Folded Operations over Maps
-
-A *folded operation* is the most general of iterations. The folded
-function takes two arguments: an *accumulator* and the structure
-*element* at hand, with which it then produces a new accumulator. This
-enables having a partial result that becomes complete when the
-traversal of the data structure is over.
-
+<SyntaxTitle syntax="pascaligo">
+function fold : (('accumulator -> ('key, 'value) -> 'accumulator) -> map ('key, 'value) -> 'accumulator) -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val fold : ('accumulator -> ('key * 'value) -> 'accumulator) -> ('key, 'value) map -> 'accumulator -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let fold: ((('accumulator, ('key, 'value)) => 'accumulator), map('key, 'value), 'accumulator) => 'accumulator
+</SyntaxTitle>
 
 
 <Syntax syntax="pascaligo">
@@ -417,3 +474,28 @@ let fold_op = (m : register) : int => {
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function size : map ('key, 'value) -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val size : ('key, 'value) map -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let size: map('key, 'value) => nat
+</SyntaxTitle>
+
+Returns the number of items in the map.
+
+
+<SyntaxTitle syntax="pascaligo">
+function mem : key -> map (key, value) -> bool
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val mem : 'key -> ('key, 'value) map => bool
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let mem : ('key, map('key, 'value)) => bool
+</SyntaxTitle>
+
+Checks if a key exists in the map.
+
diff --git a/gitlab-pages/docs/reference/set.md b/gitlab-pages/docs/reference/set.md
index eca62a741..9478a2048 100644
--- a/gitlab-pages/docs/reference/set.md
+++ b/gitlab-pages/docs/reference/set.md
@@ -1,20 +1,45 @@
 ---
 id: set-reference
-title: Sets — Unordered unique collection of a type
+title: Set
+description: Set operations
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-Sets are unordered collections of values of the same type, like lists
-are ordered collections. Like the mathematical sets and lists, sets
-can be empty and, if not, elements of sets in LIGO are *unique*,
-whereas they can be repeated in a *list*.
+Sets are unordered collections of unique values of the same type.
 
-# Empty Sets
+<SyntaxTitle syntax="pascaligo">
+type set ('value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type 'value set
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type set('value)
+</SyntaxTitle>
 
+<SyntaxTitle syntax="pascaligo">
+function empty : set('value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val empty : 'value set
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let empty: set('value)
+</SyntaxTitle>
+
+Create an empty set.
 
 <Syntax syntax="pascaligo">
 
+```pascaligo group=sets
+const my_set : set (int) = Set.empty
+```
+
+Alternative syntax:
+
 ```pascaligo group=sets
 const my_set : set (int) = set []
 ```
@@ -35,12 +60,26 @@ let my_set : set (int) = Set.empty;
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function literal : list('value) -> set('value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val literal : 'value list -> 'value set
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let literal: list('value) => set('value)
+</SyntaxTitle>
 
-# Non-empty Sets
-
+Create a non-empty set.
 
 <Syntax syntax="pascaligo">
 
+```pascaligo group=sets
+const my_set : set (int) = Set.literal (list [3; 2; 2; 1])
+```
+
+Or use the following syntax sugar:
+
 ```pascaligo group=sets
 const my_set : set (int) = set [3; 2; 2; 1]
 ```
@@ -50,7 +89,7 @@ const my_set : set (int) = set [3; 2; 2; 1]
 
 ```cameligo group=sets
 let my_set : int set =
-  Set.add 3 (Set.add 2 (Set.add 2 (Set.add 1 (Set.empty : int set))))
+  Set.literal [3; 2; 2; 1]
 ```
 
 </Syntax>
@@ -58,19 +97,33 @@ let my_set : int set =
 
 ```reasonligo group=sets
 let my_set : set (int) =
-  Set.add (3, Set.add (2, Set.add (2, Set.add (1, Set.empty : set (int)))));
+  Set.literal ([3, 2, 2, 1]);
 ```
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function mem : 'value -> set('value) -> 'bool
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val mem : 'value -> 'value set -> bool
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let mem: ('value, set('value)) => bool
+</SyntaxTitle>
 
-# Set Membership
-
+Checks if a value exists in the set.
 
 <Syntax syntax="pascaligo">
 
 ```pascaligo group=sets
-const contains_3 : bool = my_set contains 3
+const contains_3 : bool = Set.mem(3, my_set)
+```
+
+Or:
+
+```pascaligo group=sets
+const contains_3_alt : bool = my_set contains 3
 ```
 
 </Syntax>
@@ -89,12 +142,17 @@ let contains_3 : bool = Set.mem (3, my_set);
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function cardinal : set('value) -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val cardinal : 'value set -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let cardinal: set('value) => nat
+</SyntaxTitle>
 
-# Cardinal of Sets
-
-The predefined function `Set.size` returns the number of
-elements in a given set as follows.
-
+Number of elements in a set.
 
 <Syntax syntax="pascaligo">
 
@@ -102,7 +160,7 @@ elements in a given set as follows.
 const cardinal : nat = Set.size (my_set)
 ```
 
-> Note that `size` is *deprecated*.
+> Note that `size` is *deprecated*. Please use `Set.size`
 
 </Syntax>
 <Syntax syntax="cameligo">
@@ -120,72 +178,41 @@ let cardinal : nat = Set.size (my_set);
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function add : 'value -> set('value) -> set('value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val add : 'value -> 'value set -> 'value set
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let add: ('value, set('value)) => set('value)
+</SyntaxTitle>
 
-# Updating Sets
+Add a value to a set.
 
-There are two ways to update a set, that is to add or remove from it.
+<SyntaxTitle syntax="pascaligo">
+function remove : 'value -> set('value) -> set('value)
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val remove : 'value -> 'value set -> 'value set
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let remove: ('value, set('value)) => set('value)
+</SyntaxTitle>
 
+Remove a value from a set.
 
-<Syntax syntax="pascaligo">
+<SyntaxTitle syntax="pascaligo">
+function iter : ('a -> unit) -> set('a) -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val iter : ('a -> unit) -> 'a set -> unit
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let iter: (('a => unit), set('a)) => unit
+</SyntaxTitle>
 
-In PascaLIGO, either we create a new set from the given one, or we
-modify it in-place. First, let us consider the former way:
-```pascaligo group=sets
-const larger_set  : set (int) = Set.add (4, my_set)
-const smaller_set : set (int) = Set.remove (3, my_set)
-```
-
-> Note that `set_add` and `set_remove` are *deprecated*.
-
-If we are in a block, we can use an instruction to modify the set
-bound to a given variable. This is called a *patch*. It is only
-possible to add elements by means of a patch, not remove any: it is
-the union of two sets.
-
-```pascaligo group=sets
-function update (var s : set (int)) : set (int) is block {
-  patch s with set [4; 7]
-} with s
-
-const new_set : set (int) = update (my_set)
-```
-
-</Syntax>
-<Syntax syntax="cameligo">
-
-```cameligo group=sets
-let larger_set  : int set = Set.add 4 my_set
-let smaller_set : int set = Set.remove 3 my_set
-```
-
-</Syntax>
-<Syntax syntax="reasonligo">
-
-```reasonligo group=sets
-let larger_set  : set (int) = Set.add (4, my_set);
-let smaller_set : set (int) = Set.remove (3, my_set);
-```
-
-</Syntax>
-
-
-# Functional Iteration over Sets
-
-A *functional iterator* is a function that traverses a data structure
-and calls in turn a given function over the elements of that structure
-to compute some value. Another approach is possible in PascaLIGO:
-*loops* (see the relevant section).
-
-There are three kinds of functional iterations over LIGO maps: the
-*iterated operation*, the *mapped operation* (not to be confused with
-the *map data structure*) and the *folded operation*.
-
-## Iterated Operation
-
-The first, the *iterated operation*, is an iteration over the map with
-no return value: its only use is to produce side-effects. This can be
-useful if for example you would like to check that each value inside
-of a map is within a certain range, and fail with an error otherwise.
+Iterate over values in a set.
 
 
 <Syntax syntax="pascaligo">
@@ -221,15 +248,17 @@ let iter_op = (s : set (int)) : unit => {
 
 </Syntax>
 
+<SyntaxTitle syntax="pascaligo">
+function fold : (('accumulator -> 'item -> 'accumulator) -> set ('item) -> 'accumulator) -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val fold : ('accumulator -> 'item -> 'accumulator) -> 'set list -> 'accumulator -> 'accumulator
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let fold: ((('accumulator, 'item) => 'accumulator), set('item), 'accumulator) => 'accumulator
+</SyntaxTitle>
 
-## Folded Operation
-
-A *folded operation* is the most general of iterations. The folded
-function takes two arguments: an *accumulator* and the structure
-*element* at hand, with which it then produces a new accumulator. This
-enables having a partial result that becomes complete when the
-traversal of the data structure is over.
-
+[Fold over values in a set](../language-basics/sets-lists-tuples#folded-operation)
 
 
 <Syntax syntax="pascaligo">
@@ -241,17 +270,6 @@ const sum_of_elements : int = Set.fold (sum, my_set, 0)
 
 > Note that `set_fold` is *deprecated*.
 
-It is possible to use a *loop* over a set as well.
-
-```pascaligo group=sets
-function loop (const s : set (int)) : int is block {
-  var sum : int := 0;
-  for element in set s block {
-    sum := sum + element
-  }
-} with sum
-```
-
 </Syntax>
 <Syntax syntax="cameligo">
 
@@ -269,4 +287,3 @@ let sum_of_elements : int = Set.fold (sum, my_set, 0);
 ```
 
 </Syntax>
-
diff --git a/gitlab-pages/docs/reference/string.md b/gitlab-pages/docs/reference/string.md
index c75e850a4..b61453ec7 100644
--- a/gitlab-pages/docs/reference/string.md
+++ b/gitlab-pages/docs/reference/string.md
@@ -1,45 +1,77 @@
 ---
 id: string-reference
-title: String — Manipulate string data
+title: String
+description: Operations for strings.
+hide_table_of_contents: true
 ---
 
 import Syntax from '@theme/Syntax';
+import SyntaxTitle from '@theme/SyntaxTitle';
 
-## String.size(s: string) : nat
+<SyntaxTitle syntax="pascaligo">
+type string
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+type string
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+type string
+</SyntaxTitle>
 
-Get the size of a string. [Michelson only supports ASCII strings](http://tezos.gitlab.io/whitedoc/michelson.html#constants) 
+A sequence of characters.
+
+<SyntaxTitle syntax="pascaligo">
+function length : string -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val length : string -> nat
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let length: string => nat
+</SyntaxTitle>
+
+Get the size of a string. 
+
+[Michelson only supports ASCII strings](http://tezos.gitlab.io/whitedoc/michelson.html#constants) 
 so for now you can assume that each character takes one byte of storage.
 
-
-
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function string_size (const s: string) : nat is size(s)
+function string_size (const s: string) : nat is String.length(s)
 ```
 
+> Note that `size` and `String.size` are *deprecated*. 
+
 </Syntax>
 <Syntax syntax="cameligo">
 
 ```cameligo
-let size_op (s: string) : nat = String.size s
+let size_op (s: string) : nat = String.length s
 ```
 
+> Note that `String.size` is *deprecated*.
+
 </Syntax>
 <Syntax syntax="reasonligo">
 
 ```reasonligo
-let size_op = (s: string): nat => String.size(s);
+let size_op = (s: string): nat => String.length(s);
 ```
 
+> Note that `String.size` is *deprecated*.
+
 </Syntax>
 
-
-## String.length(s: string) : nat
-
-Alias for `String.size`.
-
-## String.slice(pos1: nat, pos2: nat, s: string) : string
+<SyntaxTitle syntax="pascaligo">
+function sub : nat -> nat -> string -> string
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val sub : nat -> nat -> string -> string
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let sub: (nat, nat, string) => string
+</SyntaxTitle>
 
 Get the substring of `s` between `pos1` inclusive and `pos2` inclusive. For example
 the string "tata" given to the function below would return "at".
@@ -48,31 +80,41 @@ the string "tata" given to the function below would return "at".
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function slice_op (const s : string) : string is string_slice(1n , 2n , s)
+function slice_op (const s : string) : string is String.sub(1n , 2n , s)
 ```
 
+> Note that `string_slice` is *deprecated*.
+
 </Syntax>
 <Syntax syntax="cameligo">
 
 ```cameligo
-let slice_op (s: string) : string = String.slice 1n 2n s
+let slice_op (s: string) : string = String.sub 1n 2n s
 ```
 
+> Note that `String.slice` is *deprecated*.
+
 </Syntax>
 <Syntax syntax="reasonligo">
 
 ```reasonligo
-let slice_op = (s: string): string => String.slice(1n, 2n, s);
+let slice_op = (s: string): string => String.sub(1n, 2n, s);
 ```
 
+> Note that `String.slice` is *deprecated*.
+
 </Syntax>
 
 
-## String.sub(pos1: nat, pos2: nat, s: string) : string
-
-Alias for `String.slice`.
-
-## String.concat(s1: string, s2: string) : string
+<SyntaxTitle syntax="pascaligo">
+function concat : string -> string -> string
+</SyntaxTitle>
+<SyntaxTitle syntax="cameligo">
+val concat : string -> string -> string
+</SyntaxTitle>
+<SyntaxTitle syntax="reasonligo">
+let concat: (string, string) => string
+</SyntaxTitle>
 
 Concatenate two strings and return the result.
 
@@ -81,21 +123,40 @@ Concatenate two strings and return the result.
 <Syntax syntax="pascaligo">
 
 ```pascaligo
-function concat_op (const s : string) : string is s ^ "toto"
+function concat_op (const s : string) : string is String.concat(s, "toto")
+```
+
+Alternatively:
+
+```pascaligo
+function concat_op_alt (const s : string) : string is s ^ "toto"
 ```
 
 </Syntax>
 <Syntax syntax="cameligo">
 
 ```cameligo
-let concat_syntax (s: string) = s ^ "test_literal"
+let concat_syntax (s: string) = String.concat s "test_literal"
 ```
 
+Alternatively:
+
+```cameligo
+let concat_syntax_alt (s: string) = s ^ "test_literal"
+```
+
+
 </Syntax>
 <Syntax syntax="reasonligo">
 
 ```reasonligo
-let concat_syntax = (s: string) => s ++ "test_literal";
+let concat_syntax = (s: string) => String.concat(s, "test_literal");
+```
+
+Alternatively:
+
+```reasonligo
+let concat_syntax_alt = (s: string) => s ++ "test_literal";
 ```
 
 </Syntax>
diff --git a/gitlab-pages/website/sidebars.json b/gitlab-pages/website/sidebars.json
index bde7acba5..36cff21e1 100644
--- a/gitlab-pages/website/sidebars.json
+++ b/gitlab-pages/website/sidebars.json
@@ -21,17 +21,20 @@
       "advanced/first-contract",
       "advanced/michelson-and-ligo"
     ],
-    "API & Reference": [
+    "Reference": [
       "api/cli-commands",
-      "api/cheat-sheet",
+      "api/cheat-sheet"
+    ],
+    "API":[
       "reference/big-map-reference",
+      "reference/bitwise-reference",
       "reference/bytes-reference",
-      "reference/crypto-reference",
-      "reference/current-reference",
+      "reference/crypto-reference",      
       "reference/list-reference",
       "reference/map-reference",
       "reference/set-reference",
-      "reference/string-reference"
+      "reference/string-reference",
+      "reference/current-reference"
     ]
   },
   "contributors-docs": {
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index 7d2807b44..deb541216 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -151,8 +151,8 @@ module Simplify = struct
     (* String module *)
 
     | "String.length"   -> ok C_SIZE
-    | "String.size"     -> ok C_SIZE
-    | "String.slice"    -> ok C_SLICE
+    | "String.size"     -> ok C_SIZE  (* Deprecated *)
+    | "String.slice"    -> ok C_SLICE (* Deprecated *)
     | "String.sub"      -> ok C_SLICE
     | "String.concat"   -> ok C_CONCAT
 

From 626054ed668c64ec5200118dd8e12ee032c081b3 Mon Sep 17 00:00:00 2001
From: Sander Spies <sandermail@gmail.com>
Date: Wed, 18 Mar 2020 09:49:35 +0100
Subject: [PATCH 34/43] Describe nested functions

---
 .../docs/language-basics/functions.md         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gitlab-pages/docs/language-basics/functions.md b/gitlab-pages/docs/language-basics/functions.md
index 5d34a5e74..f8fc729a6 100644
--- a/gitlab-pages/docs/language-basics/functions.md
+++ b/gitlab-pages/docs/language-basics/functions.md
@@ -299,6 +299,41 @@ gitlab-pages/docs/language-basics/src/functions/incr_map.religo incr_map
 
 </Syntax>
 
+
+## Nested functions (also known as closures)
+It's possible to place functions inside other functions. These functions
+have access to variables in the same scope. 
+
+<Syntax syntax="pascaligo">
+
+```pascaligo
+function closure_example (const i : int) : int is
+  block {
+    function closure (const j : int) : int is i + j
+  } with closure (i)
+```
+
+</Syntax>
+<Syntax syntax="cameligo">
+
+```cameligo
+let closure_example (i : int) : int =
+  let closure : int -> int = fun (j : int) -> i + j in
+  closure i
+```
+
+</Syntax>
+<Syntax syntax="reasonligo">
+
+```reasonligo
+let closure_example = (i : int) : int => {
+  let closure = (j: int): int => i + j;
+  closure(i);
+};
+```
+
+</Syntax>
+
 ## Recursive function
 
 LIGO functions are not recursive by default, the user need to indicate that the function is recursive.

From 2abd737ed33adfc042b619872f0c6009274978a4 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Thu, 12 Mar 2020 23:20:39 +0100
Subject: [PATCH 35/43] compiling

---
 src/bin/cli.ml                                |  76 +++-
 src/main/compile/dune                         |  10 +-
 src/main/compile/helpers.ml                   |  42 +-
 src/main/compile/of_abstracted.ml             |  25 ++
 src/main/compile/of_complex.ml                |  25 ++
 src/main/compile/of_simplified.ml             |   4 +-
 src/main/compile/of_source.ml                 |  20 +-
 src/main/run/dune                             |   4 +-
 .../{6-interpreter => 10-interpreter}/dune    |   0
 .../interpreter.ml                            |   0
 .../interpreter.mli                           |   0
 .../{6-transpiler => 10-transpiler}/dune      |   0
 .../helpers.ml                                |   0
 .../transpiler.ml                             |   0
 .../transpiler.mli                            |   0
 .../untranspiler.ml                           |   0
 .../{7-self_mini_c => 11-self_mini_c}/dune    |   0
 .../helpers.ml                                |   0
 .../michelson_restrictions.ml                 |   0
 .../self_mini_c.ml                            |   0
 .../subst.ml                                  |   0
 .../{8-compiler => 12-compiler}/compiler.ml   |   0
 .../compiler_environment.ml                   |   0
 .../compiler_environment.mli                  |   0
 .../compiler_program.ml                       |   0
 .../compiler_program.mli                      |   0
 .../compiler_type.ml                          |   0
 .../compiler_type.mli                         |   0
 src/passes/{8-compiler => 12-compiler}/dune   |   0
 .../{8-compiler => 12-compiler}/uncompiler.ml |   0
 .../uncompiler.mli                            |   0
 .../dune                                      |   0
 .../helpers.ml                                |   0
 .../main.ml                                   |   0
 .../self_michelson.ml                         |   0
 .../abstracter.ml}                            |   0
 .../{2-simplify => 2-abstracter}/cameligo.ml  | 199 +++++-----
 .../{2-simplify => 2-abstracter}/cameligo.mli |  29 +-
 .../camligo.ml.old                            |   2 +-
 src/passes/{2-simplify => 2-abstracter}/dune  |  10 +-
 .../{2-simplify => 2-abstracter}/pascaligo.ml | 360 +++++++++---------
 .../pascaligo.mli                             |   6 +-
 src/passes/3-self_ast_imperative/dune         |  13 +
 .../entrypoints_lenght_limit.ml               |   2 +-
 .../helpers.ml                                |   2 +-
 .../literals.ml                               |   4 +-
 .../none_variant.ml                           |   2 +-
 .../self_ast_imperative.ml}                   |   0
 .../tezos_type_annotation.ml                  |   2 +-
 src/passes/4-Instruction_remover/dune         |  14 +
 .../instruction_remover.ml                    | 186 +++++++++
 src/passes/5-self_ast_complex/dune            |  13 +
 src/passes/5-self_ast_typed/main.ml           |   0
 src/passes/6-simplifier/dune                  |  14 +
 src/passes/6-simplifier/simplifier.ml         | 187 +++++++++
 .../dune                                      |   0
 src/passes/{4-typer-new => 8-typer-new}/PP.ml |   0
 src/passes/{4-typer-new => 8-typer-new}/dune  |   0
 .../{4-typer-new => 8-typer-new}/solver.ml    |   0
 .../{4-typer-new => 8-typer-new}/typer.ml     |   2 +-
 .../{4-typer-new => 8-typer-new}/typer.ml.old |   0
 .../{4-typer-new => 8-typer-new}/typer.mli    |   0
 .../{4-typer-new => 8-typer-new}/typer_new.ml |   0
 src/passes/{4-typer-old => 8-typer-old}/dune  |   0
 .../{4-typer-old => 8-typer-old}/typer.ml     |   2 +-
 .../{4-typer-old => 8-typer-old}/typer.mli    |   0
 .../{4-typer-old => 8-typer-old}/typer_old.ml |   0
 src/passes/{4-typer => 8-typer}/dune          |   0
 src/passes/{4-typer => 8-typer}/typer.ml      |   0
 src/passes/{4-typer => 8-typer}/typer.mli     |   0
 .../contract_passes.ml                        |   0
 .../dune                                      |   0
 .../helpers.ml                                |   0
 .../self_ast_typed.ml                         |   0
 .../tail_recursion.ml                         |   0
 src/passes/9-self_michelson/main.ml           |   0
 src/passes/operators/dune                     |   3 +
 src/passes/operators/operators.ml             |   4 +-
 src/passes/operators/operators.mli            |   4 +-
 .../PP.ml                                     |   6 +-
 .../ast_imperative.ml}                        |   0
 .../combinators.ml                            |  84 ++--
 .../combinators.mli                           |   1 +
 src/stages/1-ast_imperative/dune              |  13 +
 .../misc.ml                                   |   0
 .../misc.mli                                  |   0
 src/stages/1-ast_imperative/types.ml          | 118 ++++++
 src/stages/2-ast_complex/PP.ml                | 138 +++++++
 src/stages/2-ast_complex/ast_complex.ml       |   8 +
 src/stages/2-ast_complex/combinators.ml       | 268 +++++++++++++
 src/stages/2-ast_complex/combinators.mli      | 135 +++++++
 src/stages/2-ast_complex/dune                 |  13 +
 src/stages/2-ast_complex/misc.ml              | 331 ++++++++++++++++
 src/stages/2-ast_complex/misc.mli             |  20 +
 src/stages/2-ast_complex/types.ml             | 117 ++++++
 src/stages/3-ast_simplified/PP.ml             | 138 +++++++
 src/stages/3-ast_simplified/ast_simplified.ml |   8 +
 src/stages/3-ast_simplified/combinators.ml    | 268 +++++++++++++
 src/stages/3-ast_simplified/combinators.mli   | 135 +++++++
 .../{ast_simplified => 3-ast_simplified}/dune |   0
 src/stages/3-ast_simplified/misc.ml           | 331 ++++++++++++++++
 src/stages/3-ast_simplified/misc.mli          |  20 +
 .../types.ml                                  |  17 +-
 src/stages/{ast_typed => 4-ast_typed}/PP.ml   |   0
 .../{ast_typed => 4-ast_typed}/ast_typed.ml   |   0
 .../{ast_typed => 4-ast_typed}/combinators.ml |   0
 .../combinators.mli                           |   0
 .../combinators_environment.ml                |   0
 .../combinators_environment.mli               |   0
 src/stages/{ast_typed => 4-ast_typed}/dune    |   0
 .../{ast_typed => 4-ast_typed}/environment.ml |   0
 .../environment.mli                           |   0
 src/stages/{ast_typed => 4-ast_typed}/misc.ml |   0
 .../{ast_typed => 4-ast_typed}/misc.mli       |   0
 .../{ast_typed => 4-ast_typed}/misc_smart.ml  |   0
 .../{ast_typed => 4-ast_typed}/misc_smart.mli |   0
 .../{ast_typed => 4-ast_typed}/types.ml       |   0
 src/stages/{mini_c => 5-mini_c}/PP.ml         |   0
 src/stages/{mini_c => 5-mini_c}/PP.mli        |   0
 .../{mini_c => 5-mini_c}/combinators.ml       |   0
 .../{mini_c => 5-mini_c}/combinators.mli      |   0
 .../{mini_c => 5-mini_c}/combinators_smart.ml |   0
 src/stages/{mini_c => 5-mini_c}/dune          |   0
 .../{mini_c => 5-mini_c}/environment.ml       |   0
 .../{mini_c => 5-mini_c}/environment.mli      |   0
 src/stages/{mini_c => 5-mini_c}/mini_c.ml     |   0
 src/stages/{mini_c => 5-mini_c}/misc.ml       |   0
 src/stages/{mini_c => 5-mini_c}/types.ml      |   0
 src/stages/typesystem/misc.ml                 |  10 +-
 129 files changed, 3015 insertions(+), 430 deletions(-)
 create mode 100644 src/main/compile/of_abstracted.ml
 create mode 100644 src/main/compile/of_complex.ml
 rename src/passes/{6-interpreter => 10-interpreter}/dune (100%)
 rename src/passes/{6-interpreter => 10-interpreter}/interpreter.ml (100%)
 rename src/passes/{6-interpreter => 10-interpreter}/interpreter.mli (100%)
 rename src/passes/{6-transpiler => 10-transpiler}/dune (100%)
 rename src/passes/{6-transpiler => 10-transpiler}/helpers.ml (100%)
 rename src/passes/{6-transpiler => 10-transpiler}/transpiler.ml (100%)
 rename src/passes/{6-transpiler => 10-transpiler}/transpiler.mli (100%)
 rename src/passes/{6-transpiler => 10-transpiler}/untranspiler.ml (100%)
 rename src/passes/{7-self_mini_c => 11-self_mini_c}/dune (100%)
 rename src/passes/{7-self_mini_c => 11-self_mini_c}/helpers.ml (100%)
 rename src/passes/{7-self_mini_c => 11-self_mini_c}/michelson_restrictions.ml (100%)
 rename src/passes/{7-self_mini_c => 11-self_mini_c}/self_mini_c.ml (100%)
 rename src/passes/{7-self_mini_c => 11-self_mini_c}/subst.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_environment.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_environment.mli (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_program.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_program.mli (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_type.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/compiler_type.mli (100%)
 rename src/passes/{8-compiler => 12-compiler}/dune (100%)
 rename src/passes/{8-compiler => 12-compiler}/uncompiler.ml (100%)
 rename src/passes/{8-compiler => 12-compiler}/uncompiler.mli (100%)
 rename src/passes/{9-self_michelson => 13-self_michelson}/dune (100%)
 rename src/passes/{9-self_michelson => 13-self_michelson}/helpers.ml (100%)
 rename src/passes/{3-self_ast_simplified => 13-self_michelson}/main.ml (100%)
 rename src/passes/{9-self_michelson => 13-self_michelson}/self_michelson.ml (100%)
 rename src/passes/{2-simplify/simplify.ml => 2-abstracter/abstracter.ml} (100%)
 rename src/passes/{2-simplify => 2-abstracter}/cameligo.ml (87%)
 rename src/passes/{2-simplify => 2-abstracter}/cameligo.mli (68%)
 rename src/passes/{2-simplify => 2-abstracter}/camligo.ml.old (99%)
 rename src/passes/{2-simplify => 2-abstracter}/dune (62%)
 rename src/passes/{2-simplify => 2-abstracter}/pascaligo.ml (83%)
 rename src/passes/{2-simplify => 2-abstracter}/pascaligo.mli (76%)
 create mode 100644 src/passes/3-self_ast_imperative/dune
 rename src/passes/{3-self_ast_simplified => 3-self_ast_imperative}/entrypoints_lenght_limit.ml (97%)
 rename src/passes/{3-self_ast_simplified => 3-self_ast_imperative}/helpers.ml (99%)
 rename src/passes/{3-self_ast_simplified => 3-self_ast_imperative}/literals.ml (98%)
 rename src/passes/{3-self_ast_simplified => 3-self_ast_imperative}/none_variant.ml (95%)
 rename src/passes/{3-self_ast_simplified/self_ast_simplified.ml => 3-self_ast_imperative/self_ast_imperative.ml} (100%)
 rename src/passes/{3-self_ast_simplified => 3-self_ast_imperative}/tezos_type_annotation.ml (98%)
 create mode 100644 src/passes/4-Instruction_remover/dune
 create mode 100644 src/passes/4-Instruction_remover/instruction_remover.ml
 create mode 100644 src/passes/5-self_ast_complex/dune
 delete mode 100644 src/passes/5-self_ast_typed/main.ml
 create mode 100644 src/passes/6-simplifier/dune
 create mode 100644 src/passes/6-simplifier/simplifier.ml
 rename src/passes/{3-self_ast_simplified => 7-self_ast_simplified}/dune (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/PP.ml (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/dune (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/solver.ml (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/typer.ml (99%)
 rename src/passes/{4-typer-new => 8-typer-new}/typer.ml.old (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/typer.mli (100%)
 rename src/passes/{4-typer-new => 8-typer-new}/typer_new.ml (100%)
 rename src/passes/{4-typer-old => 8-typer-old}/dune (100%)
 rename src/passes/{4-typer-old => 8-typer-old}/typer.ml (99%)
 rename src/passes/{4-typer-old => 8-typer-old}/typer.mli (100%)
 rename src/passes/{4-typer-old => 8-typer-old}/typer_old.ml (100%)
 rename src/passes/{4-typer => 8-typer}/dune (100%)
 rename src/passes/{4-typer => 8-typer}/typer.ml (100%)
 rename src/passes/{4-typer => 8-typer}/typer.mli (100%)
 rename src/passes/{5-self_ast_typed => 9-self_ast_typed}/contract_passes.ml (100%)
 rename src/passes/{5-self_ast_typed => 9-self_ast_typed}/dune (100%)
 rename src/passes/{5-self_ast_typed => 9-self_ast_typed}/helpers.ml (100%)
 rename src/passes/{5-self_ast_typed => 9-self_ast_typed}/self_ast_typed.ml (100%)
 rename src/passes/{5-self_ast_typed => 9-self_ast_typed}/tail_recursion.ml (100%)
 delete mode 100644 src/passes/9-self_michelson/main.ml
 rename src/stages/{ast_simplified => 1-ast_imperative}/PP.ml (99%)
 rename src/stages/{ast_simplified/ast_simplified.ml => 1-ast_imperative/ast_imperative.ml} (100%)
 rename src/stages/{ast_simplified => 1-ast_imperative}/combinators.ml (71%)
 rename src/stages/{ast_simplified => 1-ast_imperative}/combinators.mli (98%)
 create mode 100644 src/stages/1-ast_imperative/dune
 rename src/stages/{ast_simplified => 1-ast_imperative}/misc.ml (100%)
 rename src/stages/{ast_simplified => 1-ast_imperative}/misc.mli (100%)
 create mode 100644 src/stages/1-ast_imperative/types.ml
 create mode 100644 src/stages/2-ast_complex/PP.ml
 create mode 100644 src/stages/2-ast_complex/ast_complex.ml
 create mode 100644 src/stages/2-ast_complex/combinators.ml
 create mode 100644 src/stages/2-ast_complex/combinators.mli
 create mode 100644 src/stages/2-ast_complex/dune
 create mode 100644 src/stages/2-ast_complex/misc.ml
 create mode 100644 src/stages/2-ast_complex/misc.mli
 create mode 100644 src/stages/2-ast_complex/types.ml
 create mode 100644 src/stages/3-ast_simplified/PP.ml
 create mode 100644 src/stages/3-ast_simplified/ast_simplified.ml
 create mode 100644 src/stages/3-ast_simplified/combinators.ml
 create mode 100644 src/stages/3-ast_simplified/combinators.mli
 rename src/stages/{ast_simplified => 3-ast_simplified}/dune (100%)
 create mode 100644 src/stages/3-ast_simplified/misc.ml
 create mode 100644 src/stages/3-ast_simplified/misc.mli
 rename src/stages/{ast_simplified => 3-ast_simplified}/types.ml (98%)
 rename src/stages/{ast_typed => 4-ast_typed}/PP.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/ast_typed.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/combinators.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/combinators.mli (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/combinators_environment.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/combinators_environment.mli (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/dune (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/environment.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/environment.mli (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/misc.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/misc.mli (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/misc_smart.ml (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/misc_smart.mli (100%)
 rename src/stages/{ast_typed => 4-ast_typed}/types.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/PP.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/PP.mli (100%)
 rename src/stages/{mini_c => 5-mini_c}/combinators.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/combinators.mli (100%)
 rename src/stages/{mini_c => 5-mini_c}/combinators_smart.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/dune (100%)
 rename src/stages/{mini_c => 5-mini_c}/environment.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/environment.mli (100%)
 rename src/stages/{mini_c => 5-mini_c}/mini_c.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/misc.ml (100%)
 rename src/stages/{mini_c => 5-mini_c}/types.ml (100%)

diff --git a/src/bin/cli.ml b/src/bin/cli.ml
index ad36e987c..2a1f21744 100644
--- a/src/bin/cli.ml
+++ b/src/bin/cli.ml
@@ -140,7 +140,9 @@ module Run = Ligo.Run.Of_michelson
 let compile_file =
   let f source_file entry_point syntax display_format disable_typecheck michelson_format =
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complexed  = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complexed in
     let%bind typed,_    = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     let%bind michelson  = Compile.Of_mini_c.aggregate_and_compile_contract mini_c entry_point in
@@ -168,7 +170,9 @@ let print_cst =
 let print_ast =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     ok @@ Format.asprintf "%a\n" Compile.Of_simplified.pretty_print simplified
   )
   in
@@ -180,7 +184,9 @@ let print_ast =
 let print_typed_ast =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
     ok @@ Format.asprintf "%a\n" Compile.Of_typed.pretty_print typed
   )
@@ -193,7 +199,9 @@ let print_typed_ast =
 let print_mini_c =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     ok @@ Format.asprintf "%a\n" Compile.Of_mini_c.pretty_print mini_c
@@ -207,7 +215,9 @@ let print_mini_c =
 let measure_contract =
   let f source_file entry_point syntax display_format  =
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     let%bind typed,_    = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     let%bind michelson  = Compile.Of_mini_c.aggregate_and_compile_contract mini_c entry_point in
@@ -224,7 +234,9 @@ let measure_contract =
 let compile_parameter =
   let f source_file entry_point expression syntax amount balance sender source predecessor_timestamp display_format michelson_format =
     toplevel ~display_format @@
-    let%bind simplified      = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted     = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
     let%bind michelson_prg   = Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg entry_point in
@@ -234,7 +246,9 @@ let compile_parameter =
       Compile.Of_michelson.build_contract michelson_prg in
 
     let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind simplified_param = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
+    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
     let%bind (typed_param,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_param in
     let%bind mini_c_param     = Compile.Of_typed.compile_expression typed_param in
     let%bind compiled_param   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c_param in
@@ -255,7 +269,9 @@ let interpret =
     toplevel ~display_format @@
     let%bind (decl_list,state,env) = match init_file with
       | Some init_file ->
-        let%bind simplified      = Compile.Of_source.compile init_file (Syntax_name syntax) in
+        let%bind abstracted      = Compile.Of_source.compile init_file (Syntax_name syntax) in
+        let%bind complex    = Compile.Of_abstracted.compile abstracted in
+        let%bind simplified = Compile.Of_complex.compile complex in
         let%bind typed_prg,state = Compile.Of_simplified.compile Env simplified in
         let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
         let      env             = Ast_typed.program_environment typed_prg in
@@ -263,7 +279,9 @@ let interpret =
       | None -> ok ([],Typer.Solver.initial_state,Ast_typed.Environment.full_empty) in
 
     let%bind v_syntax       = Helpers.syntax_to_variant (Syntax_name syntax) init_file in
-    let%bind simplified_exp = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind abstracted_exp = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind complex_exp    = Compile.Of_abstracted.compile_expression abstracted_exp in
+    let%bind simplified_exp = Compile.Of_complex.compile_expression complex_exp in
     let%bind (typed_exp,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_exp in
     let%bind mini_c_exp     = Compile.Of_typed.compile_expression typed_exp in
     let%bind compiled_exp   = Compile.Of_mini_c.aggregate_and_compile_expression decl_list mini_c_exp in
@@ -286,7 +304,9 @@ let interpret =
 let temp_ligo_interpreter =
   let f source_file syntax display_format =
     toplevel ~display_format @@
-    let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex    = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified = Compile.Of_complex.compile complex in
     let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
     let%bind res = Compile.Of_typed.some_interpret typed in
     ok @@ Format.asprintf "%s\n" res
@@ -300,7 +320,9 @@ let temp_ligo_interpreter =
 let compile_storage =
   let f source_file entry_point expression syntax amount balance sender source predecessor_timestamp display_format michelson_format =
     toplevel ~display_format @@
-    let%bind simplified      = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted      = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex         = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified      = Compile.Of_complex.compile complex in
     let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
     let%bind michelson_prg   = Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg entry_point in
@@ -310,7 +332,9 @@ let compile_storage =
       Compile.Of_michelson.build_contract michelson_prg in
 
     let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind simplified_param = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
+    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
     let%bind (typed_param,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_param in
     let%bind mini_c_param     = Compile.Of_typed.compile_expression typed_param in
     let%bind compiled_param   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c_param in
@@ -329,7 +353,9 @@ let compile_storage =
 let dry_run =
   let f source_file entry_point storage input amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
-    let%bind simplified      = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted      = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex         = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified      = Compile.Of_complex.compile complex in
     let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
     let      env             = Ast_typed.program_environment typed_prg in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
@@ -339,7 +365,9 @@ let dry_run =
       Compile.Of_michelson.build_contract michelson_prg in
 
     let%bind v_syntax          = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind simplified        = Compile.Of_source.compile_contract_input storage input v_syntax in
+    let%bind abstracted        = Compile.Of_source.compile_contract_input storage input v_syntax in
+    let%bind complex           = Compile.Of_abstracted.compile_expression abstracted in
+    let%bind simplified        = Compile.Of_complex.compile_expression complex in
     let%bind typed,_           = Compile.Of_simplified.compile_expression ~env ~state simplified in
     let%bind mini_c            = Compile.Of_typed.compile_expression typed in
     let%bind compiled_params   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c in
@@ -365,13 +393,17 @@ let run_function =
   let f source_file entry_point parameter amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
     let%bind v_syntax        = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind simplified_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex_prg     = Compile.Of_abstracted.compile abstracted_prg in
+    let%bind simplified_prg  = Compile.Of_complex.compile complex_prg in
     let%bind typed_prg,state = Compile.Of_simplified.compile Env simplified_prg in
     let      env             = Ast_typed.program_environment typed_prg in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
 
 
-    let%bind simplified_param = Compile.Of_source.compile_expression v_syntax parameter in
+    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax parameter in
+    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
+    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
     let%bind app              = Compile.Of_simplified.apply entry_point simplified_param in
     let%bind (typed_app,_)    = Compile.Of_simplified.compile_expression ~env ~state app in
     let%bind compiled_applied = Compile.Of_typed.compile_expression typed_app in
@@ -396,7 +428,9 @@ let run_function =
 let evaluate_value =
   let f source_file entry_point amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
-    let%bind simplified        = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted        = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex           = Compile.Of_abstracted.compile abstracted in
+    let%bind simplified        = Compile.Of_complex.compile complex in
     let%bind typed_prg,_       = Compile.Of_simplified.compile Env simplified in
     let%bind mini_c            = Compile.Of_typed.compile typed_prg in
     let%bind (exp,_)           = Mini_c.get_entry mini_c entry_point in
@@ -418,7 +452,9 @@ let compile_expression =
     let%bind v_syntax = Helpers.syntax_to_variant (Syntax_name syntax) (None) in
     let      env      = Ast_typed.Environment.full_empty in
     let      state    = Typer.Solver.initial_state in
-    let%bind simplified    = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind abstracted    = Compile.Of_source.compile_expression v_syntax expression in
+    let%bind complex       = Compile.Of_abstracted.compile_expression abstracted in
+    let%bind simplified    = Compile.Of_complex.compile_expression complex in
     let%bind (typed_exp,_) = Compile.Of_simplified.compile_expression ~env ~state simplified in
     let%bind mini_c_exp    = Compile.Of_typed.compile_expression typed_exp in
     let%bind compiled_exp  = Compile.Of_mini_c.compile_expression mini_c_exp in
@@ -442,7 +478,9 @@ let dump_changelog =
 let list_declarations =
   let f source_file syntax =
     toplevel ~display_format:(`Human_readable) @@
-    let%bind simplified_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind abstracted_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
+    let%bind complex_prg     = Compile.Of_abstracted.compile abstracted_prg in
+    let%bind simplified_prg  = Compile.Of_complex.compile complex_prg in
     let json_decl = List.map (fun decl -> `String decl) @@ Compile.Of_simplified.list_declarations simplified_prg in
     ok @@ J.to_string @@ `Assoc [ ("source_file", `String source_file) ; ("declarations", `List json_decl) ]
   in
diff --git a/src/main/compile/dune b/src/main/compile/dune
index 98ff34494..514fa22f5 100644
--- a/src/main/compile/dune
+++ b/src/main/compile/dune
@@ -5,14 +5,20 @@
     simple-utils
     tezos-utils
     parser
-    simplify
-    interpreter
+    abstracter
+    ast_imperative
+    self_ast_imperative
+    instruction_remover
+    ast_complex
+    self_ast_complex
+    simplifier
     ast_simplified
     self_ast_simplified
     typer_new
     typer
     ast_typed
     self_ast_typed
+    interpreter
     transpiler
     mini_c
     self_mini_c
diff --git a/src/main/compile/helpers.ml b/src/main/compile/helpers.ml
index 95038a5b9..d4809c9eb 100644
--- a/src/main/compile/helpers.ml
+++ b/src/main/compile/helpers.ml
@@ -24,8 +24,8 @@ let parsify_pascaligo source =
     trace (simple_error "parsing") @@
     Parser.Pascaligo.parse_file source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-      Simplify.Pascaligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+      Abstracter.Pascaligo.abstr_program raw
   in ok simplified
 
 let parsify_expression_pascaligo source =
@@ -33,8 +33,8 @@ let parsify_expression_pascaligo source =
     trace (simple_error "parsing expression") @@
     Parser.Pascaligo.parse_expression source in
   let%bind simplified =
-    trace (simple_error "simplifying expression") @@
-    Simplify.Pascaligo.simpl_expression raw
+    trace (simple_error "abstracting expression") @@
+    Abstracter.Pascaligo.abstr_expression raw
   in ok simplified
 
 let parsify_cameligo source =
@@ -42,8 +42,8 @@ let parsify_cameligo source =
     trace (simple_error "parsing") @@
     Parser.Cameligo.parse_file source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-    Simplify.Cameligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+    Abstracter.Cameligo.abstr_program raw
   in ok simplified
 
 let parsify_expression_cameligo source =
@@ -51,8 +51,8 @@ let parsify_expression_cameligo source =
     trace (simple_error "parsing expression") @@
     Parser.Cameligo.parse_expression source in
   let%bind simplified =
-    trace (simple_error "simplifying expression") @@
-    Simplify.Cameligo.simpl_expression raw
+    trace (simple_error "abstracting expression") @@
+    Abstracter.Cameligo.abstr_expression raw
   in ok simplified
 
 let parsify_reasonligo source =
@@ -60,8 +60,8 @@ let parsify_reasonligo source =
     trace (simple_error "parsing") @@
     Parser.Reasonligo.parse_file source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-    Simplify.Cameligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+    Abstracter.Cameligo.abstr_program raw
   in ok simplified
 
 let parsify_expression_reasonligo source =
@@ -69,8 +69,8 @@ let parsify_expression_reasonligo source =
     trace (simple_error "parsing expression") @@
     Parser.Reasonligo.parse_expression source in
   let%bind simplified =
-    trace (simple_error "simplifying expression") @@
-    Simplify.Cameligo.simpl_expression raw
+    trace (simple_error "abstracting expression") @@
+    Abstracter.Cameligo.abstr_expression raw
   in ok simplified
 
 let parsify syntax source =
@@ -80,7 +80,7 @@ let parsify syntax source =
     | CameLIGO   -> ok parsify_cameligo
     | ReasonLIGO -> ok parsify_reasonligo in
   let%bind parsified = parsify source in
-  let%bind applied = Self_ast_simplified.all_program parsified
+  let%bind applied = Self_ast_imperative.all_program parsified
   in ok applied
 
 let parsify_expression syntax source =
@@ -89,7 +89,7 @@ let parsify_expression syntax source =
   | CameLIGO   -> ok parsify_expression_cameligo
   | ReasonLIGO -> ok parsify_expression_reasonligo in
   let%bind parsified = parsify source in
-  let%bind applied = Self_ast_simplified.all_expression parsified
+  let%bind applied = Self_ast_imperative.all_expression parsified
   in ok applied
 
 let parsify_string_reasonligo source =
@@ -97,8 +97,8 @@ let parsify_string_reasonligo source =
     trace (simple_error "parsing") @@
     Parser.Reasonligo.parse_string source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-    Simplify.Cameligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+    Abstracter.Cameligo.abstr_program raw
   in ok simplified
 
 let parsify_string_pascaligo source =
@@ -106,8 +106,8 @@ let parsify_string_pascaligo source =
     trace (simple_error "parsing") @@
     Parser.Pascaligo.parse_string source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-    Simplify.Pascaligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+    Abstracter.Pascaligo.abstr_program raw
   in ok simplified
 
 let parsify_string_cameligo source =
@@ -115,8 +115,8 @@ let parsify_string_cameligo source =
     trace (simple_error "parsing") @@
     Parser.Cameligo.parse_string source in
   let%bind simplified =
-    trace (simple_error "simplifying") @@
-    Simplify.Cameligo.simpl_program raw
+    trace (simple_error "abstracting") @@
+    Abstracter.Cameligo.abstr_program raw
   in ok simplified
 
 let parsify_string syntax source =
@@ -126,7 +126,7 @@ let parsify_string syntax source =
     | CameLIGO   -> ok parsify_string_cameligo
     | ReasonLIGO -> ok parsify_string_reasonligo in
   let%bind parsified = parsify source in
-  let%bind applied = Self_ast_simplified.all_program parsified
+  let%bind applied = Self_ast_imperative.all_program parsified
   in ok applied
 
 let pretty_print_pascaligo source =
diff --git a/src/main/compile/of_abstracted.ml b/src/main/compile/of_abstracted.ml
new file mode 100644
index 000000000..b56b1991d
--- /dev/null
+++ b/src/main/compile/of_abstracted.ml
@@ -0,0 +1,25 @@
+open Trace
+open Ast_imperative
+open Instruction_remover
+
+type form = 
+  | Contract of string
+  | Env
+
+let compile (program : program) : Ast_complex.program result =
+  remove_instruction_in_program program
+
+let compile_expression (e : expression) : Ast_complex.expression result =
+  remove_instruction_in_expression e
+
+let pretty_print formatter (program : program) = 
+  PP.program formatter program
+
+let list_declarations (program : program) : string list =
+  List.fold_left
+    (fun prev el -> 
+      let open Location in
+      match el.wrap_content with
+      | Declaration_constant (var,_,_,_) -> (Var.to_name var)::prev
+      | _ -> prev) 
+    [] program
diff --git a/src/main/compile/of_complex.ml b/src/main/compile/of_complex.ml
new file mode 100644
index 000000000..390737bbd
--- /dev/null
+++ b/src/main/compile/of_complex.ml
@@ -0,0 +1,25 @@
+open Trace
+open Ast_complex
+open Simplifier
+
+type form = 
+  | Contract of string
+  | Env
+
+let compile (program : program) : Ast_simplified.program result =
+  simplify_program program
+
+let compile_expression (e : expression) : Ast_simplified.expression result =
+  simplify_expression e
+
+let pretty_print formatter (program : program) = 
+  PP.program formatter program
+
+let list_declarations (program : program) : string list =
+  List.fold_left
+    (fun prev el -> 
+      let open Location in
+      match el.wrap_content with
+      | Declaration_constant (var,_,_,_) -> (Var.to_name var)::prev
+      | _ -> prev) 
+    [] program
diff --git a/src/main/compile/of_simplified.ml b/src/main/compile/of_simplified.ml
index 433321da4..01e3a4562 100644
--- a/src/main/compile/of_simplified.ml
+++ b/src/main/compile/of_simplified.ml
@@ -13,9 +13,9 @@ let compile (cform: form) (program : Ast_simplified.program) : (Ast_typed.progra
     | Env -> ok applied in
   ok @@ (applied', state)
 
-let compile_expression ?(env = Ast_typed.Environment.full_empty) ~(state : Typer.Solver.state) (ae : Ast_simplified.expression)
+let compile_expression ?(env = Ast_typed.Environment.full_empty) ~(state : Typer.Solver.state) (e : Ast_simplified.expression)
     : (Ast_typed.expression * Typer.Solver.state) result =
-  let%bind (ae_typed,state) = Typer.type_expression_subst env state ae in
+  let%bind (ae_typed,state) = Typer.type_expression_subst env state e in
   let () = Typer.Solver.discard_state state in
   let%bind ae_typed' = Self_ast_typed.all_expression ae_typed in
   ok @@ (ae_typed',state)
diff --git a/src/main/compile/of_source.ml b/src/main/compile/of_source.ml
index 3a075ac9e..8b737237b 100644
--- a/src/main/compile/of_source.ml
+++ b/src/main/compile/of_source.ml
@@ -1,23 +1,23 @@
 open Trace
 open Helpers
 
-let compile (source_filename:string) syntax : Ast_simplified.program result =
+let compile (source_filename:string) syntax : Ast_imperative.program result =
   let%bind syntax = syntax_to_variant syntax (Some source_filename) in
-  let%bind simplified = parsify syntax source_filename in
-  ok simplified
+  let%bind abstract = parsify syntax source_filename in
+  ok abstract
 
-let compile_string (source:string) syntax : Ast_simplified.program result =
-  let%bind simplified = parsify_string syntax source in
-  ok simplified
+let compile_string (source:string) syntax : Ast_imperative.program result =
+  let%bind abstract = parsify_string syntax source in
+  ok abstract
 
-let compile_expression : v_syntax -> string -> Ast_simplified.expression result =
+let compile_expression : v_syntax -> string -> Ast_imperative.expression result =
     fun syntax exp ->
   parsify_expression syntax exp
 
-let compile_contract_input : string -> string -> v_syntax -> Ast_simplified.expression result =
+let compile_contract_input : string -> string -> v_syntax -> Ast_imperative.expression result =
     fun storage parameter syntax ->
   let%bind (storage,parameter) = bind_map_pair (compile_expression syntax) (storage,parameter) in
-  ok @@ Ast_simplified.e_pair storage parameter
+  ok @@ Ast_imperative.e_pair storage parameter
 
 let pretty_print source_filename syntax = 
-  Helpers.pretty_print syntax source_filename 
\ No newline at end of file
+  Helpers.pretty_print syntax source_filename 
diff --git a/src/main/run/dune b/src/main/run/dune
index faaedeab4..ad6ef9cc5 100644
--- a/src/main/run/dune
+++ b/src/main/run/dune
@@ -5,7 +5,9 @@
     simple-utils
     tezos-utils
     parser
-    simplify
+    abstracter
+    self_ast_imperative
+    simplifier
     ast_simplified
     typer_new
     typer
diff --git a/src/passes/6-interpreter/dune b/src/passes/10-interpreter/dune
similarity index 100%
rename from src/passes/6-interpreter/dune
rename to src/passes/10-interpreter/dune
diff --git a/src/passes/6-interpreter/interpreter.ml b/src/passes/10-interpreter/interpreter.ml
similarity index 100%
rename from src/passes/6-interpreter/interpreter.ml
rename to src/passes/10-interpreter/interpreter.ml
diff --git a/src/passes/6-interpreter/interpreter.mli b/src/passes/10-interpreter/interpreter.mli
similarity index 100%
rename from src/passes/6-interpreter/interpreter.mli
rename to src/passes/10-interpreter/interpreter.mli
diff --git a/src/passes/6-transpiler/dune b/src/passes/10-transpiler/dune
similarity index 100%
rename from src/passes/6-transpiler/dune
rename to src/passes/10-transpiler/dune
diff --git a/src/passes/6-transpiler/helpers.ml b/src/passes/10-transpiler/helpers.ml
similarity index 100%
rename from src/passes/6-transpiler/helpers.ml
rename to src/passes/10-transpiler/helpers.ml
diff --git a/src/passes/6-transpiler/transpiler.ml b/src/passes/10-transpiler/transpiler.ml
similarity index 100%
rename from src/passes/6-transpiler/transpiler.ml
rename to src/passes/10-transpiler/transpiler.ml
diff --git a/src/passes/6-transpiler/transpiler.mli b/src/passes/10-transpiler/transpiler.mli
similarity index 100%
rename from src/passes/6-transpiler/transpiler.mli
rename to src/passes/10-transpiler/transpiler.mli
diff --git a/src/passes/6-transpiler/untranspiler.ml b/src/passes/10-transpiler/untranspiler.ml
similarity index 100%
rename from src/passes/6-transpiler/untranspiler.ml
rename to src/passes/10-transpiler/untranspiler.ml
diff --git a/src/passes/7-self_mini_c/dune b/src/passes/11-self_mini_c/dune
similarity index 100%
rename from src/passes/7-self_mini_c/dune
rename to src/passes/11-self_mini_c/dune
diff --git a/src/passes/7-self_mini_c/helpers.ml b/src/passes/11-self_mini_c/helpers.ml
similarity index 100%
rename from src/passes/7-self_mini_c/helpers.ml
rename to src/passes/11-self_mini_c/helpers.ml
diff --git a/src/passes/7-self_mini_c/michelson_restrictions.ml b/src/passes/11-self_mini_c/michelson_restrictions.ml
similarity index 100%
rename from src/passes/7-self_mini_c/michelson_restrictions.ml
rename to src/passes/11-self_mini_c/michelson_restrictions.ml
diff --git a/src/passes/7-self_mini_c/self_mini_c.ml b/src/passes/11-self_mini_c/self_mini_c.ml
similarity index 100%
rename from src/passes/7-self_mini_c/self_mini_c.ml
rename to src/passes/11-self_mini_c/self_mini_c.ml
diff --git a/src/passes/7-self_mini_c/subst.ml b/src/passes/11-self_mini_c/subst.ml
similarity index 100%
rename from src/passes/7-self_mini_c/subst.ml
rename to src/passes/11-self_mini_c/subst.ml
diff --git a/src/passes/8-compiler/compiler.ml b/src/passes/12-compiler/compiler.ml
similarity index 100%
rename from src/passes/8-compiler/compiler.ml
rename to src/passes/12-compiler/compiler.ml
diff --git a/src/passes/8-compiler/compiler_environment.ml b/src/passes/12-compiler/compiler_environment.ml
similarity index 100%
rename from src/passes/8-compiler/compiler_environment.ml
rename to src/passes/12-compiler/compiler_environment.ml
diff --git a/src/passes/8-compiler/compiler_environment.mli b/src/passes/12-compiler/compiler_environment.mli
similarity index 100%
rename from src/passes/8-compiler/compiler_environment.mli
rename to src/passes/12-compiler/compiler_environment.mli
diff --git a/src/passes/8-compiler/compiler_program.ml b/src/passes/12-compiler/compiler_program.ml
similarity index 100%
rename from src/passes/8-compiler/compiler_program.ml
rename to src/passes/12-compiler/compiler_program.ml
diff --git a/src/passes/8-compiler/compiler_program.mli b/src/passes/12-compiler/compiler_program.mli
similarity index 100%
rename from src/passes/8-compiler/compiler_program.mli
rename to src/passes/12-compiler/compiler_program.mli
diff --git a/src/passes/8-compiler/compiler_type.ml b/src/passes/12-compiler/compiler_type.ml
similarity index 100%
rename from src/passes/8-compiler/compiler_type.ml
rename to src/passes/12-compiler/compiler_type.ml
diff --git a/src/passes/8-compiler/compiler_type.mli b/src/passes/12-compiler/compiler_type.mli
similarity index 100%
rename from src/passes/8-compiler/compiler_type.mli
rename to src/passes/12-compiler/compiler_type.mli
diff --git a/src/passes/8-compiler/dune b/src/passes/12-compiler/dune
similarity index 100%
rename from src/passes/8-compiler/dune
rename to src/passes/12-compiler/dune
diff --git a/src/passes/8-compiler/uncompiler.ml b/src/passes/12-compiler/uncompiler.ml
similarity index 100%
rename from src/passes/8-compiler/uncompiler.ml
rename to src/passes/12-compiler/uncompiler.ml
diff --git a/src/passes/8-compiler/uncompiler.mli b/src/passes/12-compiler/uncompiler.mli
similarity index 100%
rename from src/passes/8-compiler/uncompiler.mli
rename to src/passes/12-compiler/uncompiler.mli
diff --git a/src/passes/9-self_michelson/dune b/src/passes/13-self_michelson/dune
similarity index 100%
rename from src/passes/9-self_michelson/dune
rename to src/passes/13-self_michelson/dune
diff --git a/src/passes/9-self_michelson/helpers.ml b/src/passes/13-self_michelson/helpers.ml
similarity index 100%
rename from src/passes/9-self_michelson/helpers.ml
rename to src/passes/13-self_michelson/helpers.ml
diff --git a/src/passes/3-self_ast_simplified/main.ml b/src/passes/13-self_michelson/main.ml
similarity index 100%
rename from src/passes/3-self_ast_simplified/main.ml
rename to src/passes/13-self_michelson/main.ml
diff --git a/src/passes/9-self_michelson/self_michelson.ml b/src/passes/13-self_michelson/self_michelson.ml
similarity index 100%
rename from src/passes/9-self_michelson/self_michelson.ml
rename to src/passes/13-self_michelson/self_michelson.ml
diff --git a/src/passes/2-simplify/simplify.ml b/src/passes/2-abstracter/abstracter.ml
similarity index 100%
rename from src/passes/2-simplify/simplify.ml
rename to src/passes/2-abstracter/abstracter.ml
diff --git a/src/passes/2-simplify/cameligo.ml b/src/passes/2-abstracter/cameligo.ml
similarity index 87%
rename from src/passes/2-simplify/cameligo.ml
rename to src/passes/2-abstracter/cameligo.ml
index 4e82b9d11..9cf5891eb 100644
--- a/src/passes/2-simplify/cameligo.ml
+++ b/src/passes/2-abstracter/cameligo.ml
@@ -1,7 +1,7 @@
 [@@@warning "-45"]
 
 open Trace
-open Ast_simplified
+open Ast_imperative
 
 module Raw = Parser.Cameligo.AST
 module SMap = Map.String
@@ -114,8 +114,8 @@ module Errors = struct
     ] in
     error ~data title message
 
-  let simplifying_expr t =
-    let title () = "Simplifying expression" in
+  let abstracting_expr t =
+    let title () = "abstracting expression" in
     let message () = "" in
     let data = [
         ("expression" ,
@@ -156,7 +156,7 @@ end
 
 open Errors
 
-open Operators.Simplify.Cameligo
+open Operators.Abstracter.Cameligo
 
 let r_split = Location.r_split
 
@@ -205,7 +205,7 @@ let rec typed_pattern_to_typed_vars : Raw.pattern -> _ = fun pattern ->
   | Raw.PTyped pt ->
      let (p,t) = pt.value.pattern,pt.value.type_expr in
      let%bind p = tuple_pattern_to_vars p in 
-     let%bind t = simpl_type_expression t in
+     let%bind t = abstr_type_expression t in
      ok @@ (p,t)
   | other -> (fail @@ wrong_pattern "parenthetical or type annotation" other)
 
@@ -213,10 +213,10 @@ and unpar_pattern : Raw.pattern -> Raw.pattern = function
   | PPar p -> unpar_pattern p.value.inside
   | _ as p -> p
 
-and simpl_type_expression : Raw.type_expr -> type_expression result = fun te ->
-  trace (simple_info "simplifying this type expression...") @@
+and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
+  trace (simple_info "abstracting this type expression...") @@
   match te with
-    TPar x -> simpl_type_expression x.value.inside
+    TPar x -> abstr_type_expression x.value.inside
   | TVar v -> (
       match type_constants v.value with
       | Ok (s,_) -> ok @@ make_t @@ T_constant s
@@ -225,8 +225,8 @@ and simpl_type_expression : Raw.type_expr -> type_expression result = fun te ->
   | TFun x -> (
       let%bind (type1 , type2) =
         let (a , _ , b) = x.value in
-        let%bind a = simpl_type_expression a in
-        let%bind b = simpl_type_expression b in
+        let%bind a = abstr_type_expression a in
+        let%bind b = abstr_type_expression b in
         ok (a , b)
       in
       ok @@ make_t @@ T_arrow {type1;type2}
@@ -234,18 +234,18 @@ and simpl_type_expression : Raw.type_expr -> type_expression result = fun te ->
   | TApp x -> (
       let (name, tuple) = x.value in
       let lst = npseq_to_list tuple.value.inside in
-      let%bind lst' = bind_map_list simpl_type_expression lst in
+      let%bind lst' = bind_map_list abstr_type_expression lst in
       let%bind cst =
         trace (unknown_predefined_type name) @@
         type_operators name.value in
       t_operator cst lst'
     )
   | TProd p -> (
-      let%bind tpl = simpl_list_type_expression  @@ npseq_to_list p.value in
+      let%bind tpl = abstr_list_type_expression  @@ npseq_to_list p.value in
       ok tpl
     )
   | TRecord r ->
-      let aux = fun (x, y) -> let%bind y = simpl_type_expression y in ok (x, y) in
+      let aux = fun (x, y) -> let%bind y = abstr_type_expression y in ok (x, y) in
       let apply (x:Raw.field_decl Raw.reg) =
         (x.value.field_name.value, x.value.field_type) in
       let%bind lst =
@@ -262,7 +262,7 @@ and simpl_type_expression : Raw.type_expr -> type_expression result = fun te ->
             None -> []
           | Some (_, TProd product) -> npseq_to_list product.value
           | Some (_, t_expr) -> [t_expr] in
-        let%bind te = simpl_list_type_expression @@ args in
+        let%bind te = abstr_list_type_expression @@ args in
         ok (v.value.constr.value, te) in
       let%bind lst = bind_list
         @@ List.map aux
@@ -270,18 +270,18 @@ and simpl_type_expression : Raw.type_expr -> type_expression result = fun te ->
       let m = List.fold_left (fun m (x, y) -> CMap.add (Constructor x) y m) CMap.empty lst in
       ok @@ make_t @@ T_sum m
 
-and simpl_list_type_expression (lst:Raw.type_expr list) : type_expression result =
+and abstr_list_type_expression (lst:Raw.type_expr list) : type_expression result =
   match lst with
   | [] -> ok @@ t_unit
-  | [hd] -> simpl_type_expression hd
+  | [hd] -> abstr_type_expression hd
   | lst ->
-      let%bind lst = bind_map_list simpl_type_expression lst in
+      let%bind lst = bind_map_list abstr_type_expression lst in
       ok @@ t_tuple lst
 
-let rec simpl_expression :
+let rec abstr_expression :
   Raw.expr -> expr result = fun t ->
   let return x = ok x in
-  let simpl_projection = fun (p:Raw.projection Region.reg) ->
+  let abstr_projection = fun (p:Raw.projection Region.reg) ->
     let (p , loc) = r_split p in
     let var =
       let name = Var.of_name p.struct_name.value in
@@ -296,7 +296,7 @@ let rec simpl_expression :
       List.map aux @@ npseq_to_list path in
     return @@ List.fold_left (e_accessor ~loc ) var path'
   in
-  let simpl_path : Raw.path -> string * label list = fun p ->
+  let abstr_path : Raw.path -> string * label list = fun p ->
     match p with
     | Raw.Name v -> (v.value , [])
     | Raw.Path p -> (
@@ -313,9 +313,9 @@ let rec simpl_expression :
         (var , path')
       )
   in
-  let simpl_update = fun (u:Raw.update Region.reg) ->
+  let abstr_update = fun (u:Raw.update Region.reg) ->
     let (u, loc) = r_split u in
-    let (name, path) = simpl_path u.record in
+    let (name, path) = abstr_path u.record in
     let record = match path with
     | [] -> e_variable (Var.of_name name)
     | _ ->
@@ -325,7 +325,7 @@ let rec simpl_expression :
     let%bind updates' =
       let aux (f:Raw.field_path_assign Raw.reg) =
         let (f,_) = r_split f in
-        let%bind expr = simpl_expression f.field_expr in
+        let%bind expr = abstr_expression f.field_expr in
         ok ( List.map (fun (x: _ Raw.reg) -> x.value) (npseq_to_list f.field_path), expr)
       in
       bind_map_list aux @@ npseq_to_list updates
@@ -342,7 +342,7 @@ let rec simpl_expression :
     bind_fold_list aux record updates'
   in
 
-  trace (simplifying_expr t) @@
+  trace (abstracting_expr t) @@
   match t with
     Raw.ELetIn e ->
       let Raw.{kwd_rec; binding; body; attributes; _} = e.value in
@@ -352,20 +352,20 @@ let rec simpl_expression :
       | (p, []) ->
       let%bind variables = tuple_pattern_to_typed_vars p in
       let%bind ty_opt =
-        bind_map_option (fun (_,te) -> simpl_type_expression te) lhs_type in
-      let%bind rhs = simpl_expression let_rhs in
+        bind_map_option (fun (_,te) -> abstr_type_expression te) lhs_type in
+      let%bind rhs = abstr_expression let_rhs in
       let rhs_b = Var.fresh ~name: "rhs" () in
       let rhs',rhs_b_expr =
         match ty_opt with
           None -> rhs, e_variable rhs_b
         | Some ty -> (e_annotation rhs ty), e_annotation (e_variable rhs_b) ty in
-      let%bind body = simpl_expression body in
+      let%bind body = abstr_expression body in
       let prepare_variable (ty_var: Raw.variable * Raw.type_expr option) =
         let variable, ty_opt = ty_var in
         let var_expr = Var.of_name variable.value in
         let%bind ty_expr_opt =
           match ty_opt with
-          | Some ty -> bind_map_option simpl_type_expression (Some ty)
+          | Some ty -> bind_map_option abstr_type_expression (Some ty)
           | None -> ok None
         in ok (var_expr, ty_expr_opt)
       in
@@ -397,7 +397,7 @@ let rec simpl_expression :
       | None -> (match let_rhs with 
         | EFun {value={binders;lhs_type}} -> 
           let f_args = nseq_to_list (binders) in
-          let%bind lhs_type' = bind_map_option (fun x -> simpl_type_expression (snd x)) lhs_type in
+          let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
           let%bind ty = bind_map_list typed_pattern_to_typed_vars f_args in
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok @@ (List.fold_right' aux lhs_type' ty)
@@ -444,8 +444,8 @@ let rec simpl_expression :
       end
   | Raw.EAnnot a ->
       let Raw.{inside=expr, _, type_expr; _}, loc = r_split a in
-      let%bind expr' = simpl_expression expr in
-      let%bind type_expr' = simpl_type_expression type_expr in
+      let%bind expr' = abstr_expression expr in
+      let%bind type_expr' = abstr_type_expression type_expr in
       return @@ e_annotation ~loc expr' type_expr'
   | EVar c ->
       let (c',loc) = r_split c in
@@ -454,7 +454,7 @@ let rec simpl_expression :
        | Ok (s,_) -> return @@ e_constant s [])
   | ECall x -> (
       let ((e1 , e2) , loc) = r_split x in
-      let%bind args = bind_map_list simpl_expression (nseq_to_list e2) in
+      let%bind args = bind_map_list abstr_expression (nseq_to_list e2) in
       let rec chain_application (f: expression) (args: expression list) =
         match args with
         | hd :: tl ->  chain_application (e_application ~loc f hd) tl
@@ -468,29 +468,29 @@ let rec simpl_expression :
           | Ok (s, _) -> return @@ e_constant ~loc s args
               )
       | e1 ->
-          let%bind e1' = simpl_expression e1 in
+          let%bind e1' = abstr_expression e1 in
           return @@ chain_application e1' args
   )
-  | EPar x -> simpl_expression x.value.inside
+  | EPar x -> abstr_expression x.value.inside
   | EUnit reg ->
       let (_ , loc) = r_split reg in
       return @@ e_literal ~loc Literal_unit
   | EBytes x ->
       let (x , loc) = r_split x in
       return @@ e_literal ~loc (Literal_bytes (Hex.to_bytes @@ snd x))
-  | ETuple tpl -> simpl_tuple_expression @@ (npseq_to_list tpl.value)
+  | ETuple tpl -> abstr_tuple_expression @@ (npseq_to_list tpl.value)
   | ERecord r ->
       let (r , loc) = r_split r in
       let%bind fields = bind_list
-        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = simpl_expression v in ok (k.value, v))
+        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = abstr_expression v in ok (k.value, v))
         @@ List.map (fun (x:Raw.field_assign Raw.reg) -> (x.value.field_name, x.value.field_expr))
         @@ npseq_to_list r.ne_elements in
       return @@ e_record_ez ~loc fields
-  | EProj p -> simpl_projection p
-  | EUpdate u -> simpl_update u
+  | EProj p -> abstr_projection p
+  | EUpdate u -> abstr_update u
   | EConstr (ESomeApp a) ->
       let (_, args), loc = r_split a in
-      let%bind arg = simpl_expression args in
+      let%bind arg = abstr_expression args in
       return @@ e_constant ~loc C_SOME [arg]
   | EConstr (ENone reg) ->
       let loc = Location.lift reg in
@@ -502,18 +502,18 @@ let rec simpl_expression :
         match args with
           None -> []
         | Some arg -> [arg] in
-      let%bind arg = simpl_tuple_expression @@ args
+      let%bind arg = abstr_tuple_expression @@ args
       in return @@ e_constructor ~loc c_name arg
   | EArith (Add c) ->
-      simpl_binop "ADD" c
+      abstr_binop "ADD" c
   | EArith (Sub c) ->
-      simpl_binop "SUB" c
+      abstr_binop "SUB" c
   | EArith (Mult c) ->
-      simpl_binop "TIMES" c
+      abstr_binop "TIMES" c
   | EArith (Div c) ->
-      simpl_binop "DIV" c
+      abstr_binop "DIV" c
   | EArith (Mod c) ->
-      simpl_binop "MOD" c
+      abstr_binop "MOD" c
   | EArith (Int n) -> (
       let (n , loc) = r_split n in
       let n = Z.to_int @@ snd @@ n in
@@ -529,7 +529,7 @@ let rec simpl_expression :
       let n = Z.to_int @@ snd @@ n in
       return @@ e_literal ~loc (Literal_mutez n)
     )
-  | EArith (Neg e) -> simpl_unop "NEG" e
+  | EArith (Neg e) -> abstr_unop "NEG" e
   | EString (String s) -> (
       let (s , loc) = r_split s in
       let s' =
@@ -540,24 +540,24 @@ let rec simpl_expression :
     )
   | EString (Cat c) ->
     let (c, loc) = r_split c in
-    let%bind string_left = simpl_expression c.arg1 in
-    let%bind string_right = simpl_expression c.arg2 in
+    let%bind string_left = abstr_expression c.arg1 in
+    let%bind string_right = abstr_expression c.arg2 in
     return @@ e_string_cat ~loc string_left string_right
-  | ELogic l -> simpl_logic_expression l
-  | EList l -> simpl_list_expression l
+  | ELogic l -> abstr_logic_expression l
+  | EList l -> abstr_list_expression l
   | ECase c -> (
       let (c , loc) = r_split c in
-      let%bind e = simpl_expression c.expr in
+      let%bind e = abstr_expression c.expr in
       let%bind lst =
         let aux (x : Raw.expr Raw.case_clause) =
-          let%bind expr = simpl_expression x.rhs in
+          let%bind expr = abstr_expression x.rhs in
           ok (x.pattern, expr) in
         bind_list
         @@ List.map aux
         @@ List.map get_value
         @@ npseq_to_list c.cases.value in
       let default_action () =
-        let%bind cases = simpl_cases lst in
+        let%bind cases = abstr_cases lst in
         return @@ e_matching ~loc e  cases in
       (* Hack to take care of patterns introduced by `parser/cameligo/Parser.mly` in "norm_fun_expr". TODO: Still needed? *)
       match lst with
@@ -571,7 +571,7 @@ let rec simpl_expression :
                   match x'.pattern with
                   | Raw.PVar y ->
                     let var_name = Var.of_name y.value in
-                    let%bind type_expr = simpl_type_expression x'.type_expr in
+                    let%bind type_expr = abstr_type_expression x'.type_expr in
                     return @@ e_let_in (var_name , Some type_expr) false false e rhs
                   | _ -> default_action ()
                 )
@@ -581,29 +581,29 @@ let rec simpl_expression :
         )
       | _ -> default_action ()
     )
-  | EFun lamb -> simpl_fun lamb
+  | EFun lamb -> abstr_fun lamb
   | ESeq s -> (
       let (s , loc) = r_split s in
       let items : Raw.expr list = pseq_to_list s.elements in
       (match items with
          [] -> return @@ e_skip ~loc ()
        | expr::more ->
-          let expr' = simpl_expression expr in
+          let expr' = abstr_expression expr in
           let apply (e1: Raw.expr) (e2: expression Trace.result) =
-            let%bind a = simpl_expression e1 in
+            let%bind a = abstr_expression e1 in
             let%bind e2' = e2 in
             return @@ e_sequence a e2'
           in List.fold_right apply more expr')
     )
   | ECond c -> (
       let (c , loc) = r_split c in
-      let%bind expr = simpl_expression c.test in
-      let%bind match_true = simpl_expression c.ifso in
-      let%bind match_false = simpl_expression c.ifnot in
+      let%bind expr = abstr_expression c.test in
+      let%bind match_true = abstr_expression c.ifso in
+      let%bind match_false = abstr_expression c.ifnot in
       return @@ e_matching ~loc expr (Match_bool {match_true; match_false})
     )
 
-and simpl_fun lamb' : expr result =
+and abstr_fun lamb' : expr result =
   let return x = ok x in
   let (lamb , loc) = r_split lamb' in
   let%bind params' =
@@ -649,7 +649,7 @@ and simpl_fun lamb' : expr result =
       | _ , None ->
           fail @@ untyped_fun_param var
       | _ , Some ty -> (
-        let%bind ty' = simpl_type_expression ty in
+        let%bind ty' = abstr_type_expression ty in
         ok (var , ty')
       )
     in
@@ -700,8 +700,8 @@ and simpl_fun lamb' : expr result =
   in
   let%bind (body , body_type) = expr_to_typed_expr body in
   let%bind output_type =
-    bind_map_option simpl_type_expression body_type in
-  let%bind body = simpl_expression body in
+    bind_map_option abstr_type_expression body_type in
+  let%bind body = abstr_expression body in
   let rec layer_arguments (arguments: (Raw.variable * type_expression) list) =
     match arguments with
     | hd :: tl ->
@@ -714,7 +714,7 @@ and simpl_fun lamb' : expr result =
   return @@ ret_lamb
 
 
-and simpl_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
+and abstr_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
   let return x = ok @@ make_option_typed x te_annot in
   match t with
   | BoolExpr (False reg) -> (
@@ -726,61 +726,61 @@ and simpl_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
       return @@ e_literal ~loc (Literal_bool true)
     )
   | BoolExpr (Or b) ->
-      simpl_binop "OR" b
+      abstr_binop "OR" b
   | BoolExpr (And b) ->
-      simpl_binop "AND" b
+      abstr_binop "AND" b
   | BoolExpr (Not b) ->
-      simpl_unop "NOT" b
+      abstr_unop "NOT" b
   | CompExpr (Lt c) ->
-      simpl_binop "LT" c
+      abstr_binop "LT" c
   | CompExpr (Gt c) ->
-      simpl_binop "GT" c
+      abstr_binop "GT" c
   | CompExpr (Leq c) ->
-      simpl_binop "LE" c
+      abstr_binop "LE" c
   | CompExpr (Geq c) ->
-      simpl_binop "GE" c
+      abstr_binop "GE" c
   | CompExpr (Equal c) ->
-      simpl_binop "EQ" c
+      abstr_binop "EQ" c
   | CompExpr (Neq c) ->
-      simpl_binop "NEQ" c
+      abstr_binop "NEQ" c
 
-and simpl_list_expression (t:Raw.list_expr) : expression result =
+and abstr_list_expression (t:Raw.list_expr) : expression result =
   let return x = ok @@ x in
   match t with
-    ECons c -> simpl_binop "CONS" c
+    ECons c -> abstr_binop "CONS" c
   | EListComp lst -> (
       let (lst , loc) = r_split lst in
       let%bind lst' =
-        bind_map_list simpl_expression @@
+        bind_map_list abstr_expression @@
         pseq_to_list lst.elements in
       return @@ e_list ~loc lst'
     )
 
-and simpl_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
+and abstr_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
   let return x = ok @@ x in
   let (args , loc) = r_split t in
-  let%bind a = simpl_expression args.arg1 in
-  let%bind b = simpl_expression args.arg2 in
+  let%bind a = abstr_expression args.arg1 in
+  let%bind b = abstr_expression args.arg2 in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ; b ]
 
-and simpl_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
+and abstr_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
   let return x = ok @@ x in
   let (t , loc) = r_split t in
-  let%bind a = simpl_expression t.arg in
+  let%bind a = abstr_expression t.arg in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ]
 
-and simpl_tuple_expression ?loc (lst:Raw.expr list) : expression result =
+and abstr_tuple_expression ?loc (lst:Raw.expr list) : expression result =
   let return x = ok @@ x in
   match lst with
   | [] -> return @@ e_literal ?loc Literal_unit
-  | [hd] -> simpl_expression hd
+  | [hd] -> abstr_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map simpl_expression lst in
+      let%bind lst = bind_list @@ List.map abstr_expression lst in
       return @@ e_tuple ?loc lst
 
-and simpl_declaration : Raw.declaration -> declaration Location.wrap list result =
+and abstr_declaration : Raw.declaration -> declaration Location.wrap list result =
   fun t ->
   let open! Raw in
   let loc : 'a . 'a Raw.reg -> _ -> _ =
@@ -788,7 +788,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
   match t with
   | TypeDecl x ->
       let {name;type_expr} : Raw.type_decl = x.value in
-      let%bind type_expression = simpl_type_expression type_expr in
+      let%bind type_expression = abstr_type_expression type_expr in
       ok @@ [loc x @@ Declaration_type (Var.of_name name.value , type_expression)]
   | Let x -> (
       let (_, recursive, let_binding, attributes), _ = r_split x in
@@ -798,17 +798,16 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
       let (hd, _) = binders in
         match hd with
         | PTuple pt ->
-          let process_variable (var_pair: pattern * Raw.expr) :
-            Ast_simplified.declaration Location.wrap result =
+          let process_variable (var_pair: pattern * Raw.expr) =
            (let (par_var, rhs_expr) = var_pair in
             let%bind (v, v_type) = pattern_to_typed_var par_var in
             let%bind v_type_expression =
               match v_type with
-              | Some v_type -> ok (to_option (simpl_type_expression v_type))
+              | Some v_type -> ok (to_option (abstr_type_expression v_type))
               | None -> ok None
             in
-            let%bind simpl_rhs_expr = simpl_expression rhs_expr in
-              ok @@ loc x @@ Declaration_constant (Var.of_name v.value, v_type_expression, inline, simpl_rhs_expr) )
+            let%bind abstr_rhs_expr = abstr_expression rhs_expr in
+              ok @@ loc x @@ Declaration_constant (Var.of_name v.value, v_type_expression, inline, abstr_rhs_expr) )
           in let%bind variables = ok @@ npseq_to_list pt.value
           in let%bind expr_bind_lst =
                match let_rhs with
@@ -840,7 +839,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
                      gen_access_tuple name ~i: (i + 1) ~accesses
                  in ok (gen_access_tuple name)
                (* TODO: Improve this error message *)
-               | other -> fail @@ simplifying_expr other
+               | other -> fail @@ abstracting_expr other
           in let%bind decls =
                (* TODO: Rewrite the gen_access_tuple so there's no List.rev *)
                bind_map_list process_variable (List.combine variables (List.rev expr_bind_lst))
@@ -848,7 +847,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
         | PPar {region = _ ; value = { lpar = _ ; inside = pt; rpar = _; } } ->
           (* Extract parenthetical multi-bind *)
           let (wild, recursive, _, attributes) = fst @@ r_split x in
-          simpl_declaration
+          abstr_declaration
             (Let {
                 region = x.region;
                 value = (wild, recursive, {binders = (pt, []);
@@ -863,7 +862,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
         let%bind var = pattern_to_var hd in
         ok (var , tl)
       in
-      let%bind lhs_type' = bind_map_option (fun x -> simpl_type_expression (snd x)) lhs_type in
+      let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
       let%bind let_rhs,lhs_type = match args with
       | [] -> ok (let_rhs, lhs_type')
       | param1::others ->
@@ -879,12 +878,12 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok (Raw.EFun {region=Region.ghost ; value=fun_},List.fold_right' aux lhs_type' ty)
       in
-      let%bind rhs' = simpl_expression let_rhs in
+      let%bind rhs' = abstr_expression let_rhs in
       let%bind lhs_type = match lhs_type with 
       | None -> (match let_rhs with 
         | EFun {value={binders;lhs_type}} -> 
           let f_args = nseq_to_list (binders) in
-          let%bind lhs_type' = bind_map_option (fun x -> simpl_type_expression (snd x)) lhs_type in
+          let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
           let%bind ty = bind_map_list typed_pattern_to_typed_vars f_args in
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok @@ (List.fold_right' aux lhs_type' ty)
@@ -907,7 +906,7 @@ and simpl_declaration : Raw.declaration -> declaration Location.wrap list result
       ok @@ [loc x @@ (Declaration_constant (Var.of_name var.value , lhs_type , inline, rhs'))]
     )
 
-and simpl_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content result =
+and abstr_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content result =
   fun t ->
   let open Raw in
   let rec get_var (t:Raw.pattern) =
@@ -1027,6 +1026,6 @@ and simpl_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content
         | _ -> simple_fail "bad option pattern"
       in bind_or (as_option () , as_variant ())
 
-let simpl_program : Raw.ast -> program result = fun t ->
-  let%bind decls = bind_map_list simpl_declaration @@ nseq_to_list t.decl in
+let abstr_program : Raw.ast -> program result = fun t ->
+  let%bind decls = bind_map_list abstr_declaration @@ nseq_to_list t.decl in
   ok @@ List.concat @@ decls
diff --git a/src/passes/2-simplify/cameligo.mli b/src/passes/2-abstracter/cameligo.mli
similarity index 68%
rename from src/passes/2-simplify/cameligo.mli
rename to src/passes/2-abstracter/cameligo.mli
index a69583d73..f2e56b348 100644
--- a/src/passes/2-simplify/cameligo.mli
+++ b/src/passes/2-abstracter/cameligo.mli
@@ -1,8 +1,7 @@
 [@@@warning "-45"]
 
 open Trace
-
-open Ast_simplified
+open Ast_imperative
 
 module Raw = Parser.Cameligo.AST
 module SMap = Map.String
@@ -29,7 +28,7 @@ module Errors : sig
   val unsupported_tuple_pattern : Raw.pattern -> unit -> error
   val unsupported_cst_constr : Raw.pattern -> unit -> error
   val unsupported_non_var_pattern : Raw.pattern -> unit -> error
-  val simplifying_expr : Raw.expr -> unit -> error
+  val abstracting_expr : Raw.expr -> unit -> error
   val only_constructors : Raw.pattern -> unit -> error
   val unsupported_sugared_lists : Raw.wild -> unit -> error
   val bad_set_definition : unit -> error
@@ -46,18 +45,18 @@ val pattern_to_var : Raw.pattern -> Raw.variable result
 val pattern_to_typed_var : Raw.pattern -> ( Raw.variable * Raw.type_expr option ) result
 val expr_to_typed_expr : Raw.expr -> ( Raw.expr * Raw.type_expr option ) result
 val patterns_to_var : Raw.pattern list -> Raw.variable result
-val simpl_type_expression : Raw.type_expr -> type_expression result
-val simpl_list_type_expression : Raw.type_expr list -> type_expression result
+val abstr_type_expression : Raw.type_expr -> type_expression result
+val abstr_list_type_expression : Raw.type_expr list -> type_expression result
 *)
-val simpl_expression : Raw.expr -> expr result
+val abstr_expression : Raw.expr -> expr result
 (*
-val simpl_fun : Raw.fun_expr Raw.reg -> expr result 
-val simpl_logic_expression : ?te_annot:type_expression -> Raw.logic_expr -> expr result
-val simpl_list_expression : Raw.list_expr -> expression result
-val simpl_binop : string -> Raw.wild Raw.bin_op Region.reg -> expression result 
-val simpl_unop : string -> Raw.wild Raw.un_op Region.reg -> expression result
-val simpl_tuple_expression : ?loc:Location.t -> Raw.expr list -> expression result
-val simpl_declaration : Raw.declaration -> declaration Location.wrap result
-val simpl_cases : (Raw.pattern * 'a) list -> 'a matching result
+val abstr_fun : Raw.fun_expr Raw.reg -> expr result 
+val abstr_logic_expression : ?te_annot:type_expression -> Raw.logic_expr -> expr result
+val abstr_list_expression : Raw.list_expr -> expression result
+val abstr_binop : string -> Raw.wild Raw.bin_op Region.reg -> expression result 
+val abstr_unop : string -> Raw.wild Raw.un_op Region.reg -> expression result
+val abstr_tuple_expression : ?loc:Location.t -> Raw.expr list -> expression result
+val abstr_declaration : Raw.declaration -> declaration Location.wrap result
+val abstr_cases : (Raw.pattern * 'a) list -> 'a matching result
 *)
-val simpl_program : Raw.ast -> program result
+val abstr_program : Raw.ast -> program result
diff --git a/src/passes/2-simplify/camligo.ml.old b/src/passes/2-abstracter/camligo.ml.old
similarity index 99%
rename from src/passes/2-simplify/camligo.ml.old
rename to src/passes/2-abstracter/camligo.ml.old
index 64c0ebd10..deb987624 100644
--- a/src/passes/2-simplify/camligo.ml.old
+++ b/src/passes/2-abstracter/camligo.ml.old
@@ -252,7 +252,7 @@ and expression_main : I.expression_main Location.wrap -> O.expression result = f
     let%bind (a' , b') = bind_map_pair expression_main ab in
     return @@ e_binop name a' b' in
   let error_main =
-    let title () = "simplifying main_expression" in
+    let title () = "abstracting main_expression" in
     let content () = Format.asprintf "%a" I.pp_expression_main (unwrap em) in
     error title content
   in
diff --git a/src/passes/2-simplify/dune b/src/passes/2-abstracter/dune
similarity index 62%
rename from src/passes/2-simplify/dune
rename to src/passes/2-abstracter/dune
index 8e506cebc..a18e1a3cd 100644
--- a/src/passes/2-simplify/dune
+++ b/src/passes/2-abstracter/dune
@@ -1,14 +1,14 @@
 (library
-  (name simplify)
-  (public_name ligo.simplify)
+  (name abstracter)
+  (public_name ligo.abstracter)
   (libraries
     simple-utils
     tezos-utils
     parser
-    ast_simplified
-    self_ast_simplified
+    ast_imperative
+    self_ast_imperative
     operators)
-  (modules cameligo pascaligo simplify)
+  (modules cameligo pascaligo abstracter)
   (preprocess
     (pps
       ppx_let
diff --git a/src/passes/2-simplify/pascaligo.ml b/src/passes/2-abstracter/pascaligo.ml
similarity index 83%
rename from src/passes/2-simplify/pascaligo.ml
rename to src/passes/2-abstracter/pascaligo.ml
index a0c051f28..d36a4532d 100644
--- a/src/passes/2-simplify/pascaligo.ml
+++ b/src/passes/2-abstracter/pascaligo.ml
@@ -1,5 +1,5 @@
 open Trace
-open Ast_simplified
+open Ast_imperative
 
 module Raw = Parser.Pascaligo.AST
 module SMap = Map.String
@@ -15,7 +15,7 @@ let pseq_to_list = function
 let get_value : 'a Raw.reg -> 'a = fun x -> x.value
 
 and repair_mutable_variable_in_matching (for_body : expression) (element_names : expression_variable list) (env : expression_variable) =
-  let%bind captured_names = Self_ast_simplified.fold_map_expression
+  let%bind captured_names = Self_ast_imperative.fold_map_expression
     (* TODO : these should use Variables sets *)
     (fun (decl_var,free_var : expression_variable list * expression_variable list) (ass_exp : expression) ->
       match ass_exp.expression_content with
@@ -47,7 +47,7 @@ and repair_mutable_variable_in_matching (for_body : expression) (element_names :
   ok @@ captured_names
 
 and repair_mutable_variable_in_loops (for_body : expression) (element_names : expression_variable list) (env : expression_variable) =
-  let%bind captured_names = Self_ast_simplified.fold_map_expression
+  let%bind captured_names = Self_ast_imperative.fold_map_expression
     (* TODO : these should use Variables sets *)
     (fun (decl_var,free_var : expression_variable list * expression_variable list) (ass_exp : expression) ->
       match ass_exp.expression_content with
@@ -186,7 +186,7 @@ module Errors = struct
 
   (* Logging *)
 
-  let simplifying_instruction t =
+  let abstracting_instruction t =
     let title () = "\nSimplifiying instruction" in
     let message () = "" in
     (** TODO: The labelled arguments should be flowing from the CLI. *)
@@ -199,14 +199,14 @@ module Errors = struct
 end
 
 open Errors
-open Operators.Simplify.Pascaligo
+open Operators.Abstracter.Pascaligo
 
 let r_split = Location.r_split
 
 (* Statements can't be simplified in isolation. [a ; b ; c] can get
    simplified either as [let x = expr in (b ; c)] if [a] is a [const x
    = expr] declaration or as [sequence(a, sequence(b, c))] for
-   everything else.  Because of this, simplifying sequences depend on
+   everything else.  Because of this, abstracting sequences depend on
    their contents. To avoid peeking in their contents, we instead
    simplify sequences elements as functions from their next elements
    to the actual result.
@@ -229,9 +229,9 @@ let return_statement expr = ok @@ fun expr'_opt ->
   | Some expr' -> ok @@ e_sequence expr expr'
 
 
-let rec simpl_type_expression (t:Raw.type_expr) : type_expression result =
+let rec abstr_type_expression (t:Raw.type_expr) : type_expression result =
   match t with
-    TPar x -> simpl_type_expression x.value.inside
+    TPar x -> abstr_type_expression x.value.inside
   | TVar v -> (
       match type_constants v.value with
       | Ok (s,_) -> ok @@ make_t @@ T_constant s
@@ -240,25 +240,25 @@ let rec simpl_type_expression (t:Raw.type_expr) : type_expression result =
   | TFun x -> (
       let%bind (a , b) =
         let (a , _ , b) = x.value in
-        bind_map_pair simpl_type_expression (a , b) in
+        bind_map_pair abstr_type_expression (a , b) in
       ok @@ make_t @@ T_arrow {type1=a;type2=b}
     )
   | TApp x ->
       let (name, tuple) = x.value in
       let lst = npseq_to_list tuple.value.inside in
       let%bind lst =
-        bind_list @@ List.map simpl_type_expression lst in (** TODO: fix constant and operator*)
+        bind_list @@ List.map abstr_type_expression lst in (** TODO: fix constant and operator*)
       let%bind cst =
         trace (unknown_predefined_type name) @@
         type_operators name.value in
       t_operator cst lst
   | TProd p ->
-      let%bind tpl = simpl_list_type_expression
+      let%bind tpl = abstr_list_type_expression
     @@ npseq_to_list p.value in
       ok tpl
   | TRecord r ->
       let aux = fun (x, y) ->
-        let%bind y = simpl_type_expression y in
+        let%bind y = abstr_type_expression y in
         ok (x, y)
       in
       let apply =
@@ -276,7 +276,7 @@ let rec simpl_type_expression (t:Raw.type_expr) : type_expression result =
             None -> []
           | Some (_, TProd product) -> npseq_to_list product.value
           | Some (_, t_expr) -> [t_expr] in
-        let%bind te = simpl_list_type_expression @@ args in
+        let%bind te = abstr_list_type_expression @@ args in
         ok (v.value.constr.value, te)
       in
       let%bind lst = bind_list
@@ -285,15 +285,15 @@ let rec simpl_type_expression (t:Raw.type_expr) : type_expression result =
       let m = List.fold_left (fun m (x, y) -> CMap.add (Constructor x) y m) CMap.empty lst in
       ok @@ make_t @@ T_sum m
 
-and simpl_list_type_expression (lst:Raw.type_expr list) : type_expression result =
+and abstr_list_type_expression (lst:Raw.type_expr list) : type_expression result =
   match lst with
   | [] -> ok @@ t_unit
-  | [hd] -> simpl_type_expression hd
+  | [hd] -> abstr_type_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map simpl_type_expression lst in
+      let%bind lst = bind_list @@ List.map abstr_type_expression lst in
       ok @@ t_tuple lst
 
-let simpl_projection : Raw.projection Region.reg -> _ = fun p ->
+let abstr_projection : Raw.projection Region.reg -> _ = fun p ->
   let (p' , loc) = r_split p in
   let var =
     let name = Var.of_name p'.struct_name.value in
@@ -309,13 +309,13 @@ let simpl_projection : Raw.projection Region.reg -> _ = fun p ->
   ok @@ List.fold_left (e_accessor ~loc) var path'
 
 
-let rec simpl_expression (t:Raw.expr) : expr result =
+let rec abstr_expression (t:Raw.expr) : expr result =
   let return x = ok x in
   match t with
   | EAnnot a -> (
       let ((expr , type_expr) , loc) = r_split a in
-      let%bind expr' = simpl_expression expr in
-      let%bind type_expr' = simpl_type_expression type_expr in
+      let%bind expr' = abstr_expression expr in
+      let%bind type_expr' = abstr_type_expression type_expr in
       return @@ e_annotation ~loc expr' type_expr'
     )
   | EVar c -> (
@@ -333,19 +333,19 @@ let rec simpl_expression (t:Raw.expr) : expr result =
         let (f_name , f_loc) = r_split name in
         match constants f_name with
         | Error _ ->
-           let%bind arg = simpl_tuple_expression ~loc:args_loc args' in
+           let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
            return @@ e_application ~loc (e_variable ~loc:f_loc (Var.of_name f_name)) arg
         | Ok (s,_) ->
-           let%bind lst = bind_map_list simpl_expression args' in
+           let%bind lst = bind_map_list abstr_expression args' in
            return @@ e_constant ~loc s lst
       )
       | f -> (
-        let%bind f' = simpl_expression f in
-        let%bind arg = simpl_tuple_expression ~loc:args_loc args' in
+        let%bind f' = abstr_expression f in
+        let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
         return @@ e_application ~loc f' arg
       )
     )
-  | EPar x -> simpl_expression x.value.inside
+  | EPar x -> abstr_expression x.value.inside
   | EUnit reg ->
     let loc = Location.lift reg in
     return @@ e_literal ~loc Literal_unit
@@ -354,16 +354,16 @@ let rec simpl_expression (t:Raw.expr) : expr result =
     return @@ e_literal ~loc (Literal_bytes (Hex.to_bytes @@ snd x'))
   | ETuple tpl ->
       let (tpl' , loc) = r_split tpl in
-      simpl_tuple_expression ~loc @@ npseq_to_list tpl'.inside
+      abstr_tuple_expression ~loc @@ npseq_to_list tpl'.inside
   | ERecord r ->
       let%bind fields = bind_list
-        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = simpl_expression v in ok (k.value, v))
+        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = abstr_expression v in ok (k.value, v))
         @@ List.map (fun (x:Raw.field_assign Raw.reg) -> (x.value.field_name, x.value.field_expr))
         @@ npseq_to_list r.value.ne_elements in
       let aux prev (k, v) = SMap.add k v prev in
       return @@ e_record (List.fold_left aux SMap.empty fields)
-  | EProj p -> simpl_projection p
-  | EUpdate u -> simpl_update u
+  | EProj p -> abstr_projection p
+  | EUpdate u -> abstr_update u
   | EConstr (ConstrApp c) -> (
       let ((c, args) , loc) = r_split c in
       match args with
@@ -372,7 +372,7 @@ let rec simpl_expression (t:Raw.expr) : expr result =
       | Some args ->
           let args, args_loc = r_split args in
           let%bind arg =
-            simpl_tuple_expression ~loc:args_loc
+            abstr_tuple_expression ~loc:args_loc
             @@ npseq_to_list args.inside in
           return @@ e_constructor ~loc c.value arg
     )
@@ -380,7 +380,7 @@ let rec simpl_expression (t:Raw.expr) : expr result =
       let ((_, args) , loc) = r_split a in
       let (args , args_loc) = r_split args in
       let%bind arg =
-        simpl_tuple_expression ~loc:args_loc
+        abstr_tuple_expression ~loc:args_loc
         @@ npseq_to_list args.inside in
       return @@ e_constant ~loc C_SOME [arg]
   | EConstr (NoneExpr reg) -> (
@@ -388,15 +388,15 @@ let rec simpl_expression (t:Raw.expr) : expr result =
       return @@ e_none ~loc ()
     )
   | EArith (Add c) ->
-      simpl_binop "ADD" c
+      abstr_binop "ADD" c
   | EArith (Sub c) ->
-      simpl_binop "SUB" c
+      abstr_binop "SUB" c
   | EArith (Mult c) ->
-      simpl_binop "TIMES" c
+      abstr_binop "TIMES" c
   | EArith (Div c) ->
-      simpl_binop "DIV" c
+      abstr_binop "DIV" c
   | EArith (Mod c) ->
-      simpl_binop "MOD" c
+      abstr_binop "MOD" c
   | EArith (Int n) -> (
       let (n , loc) = r_split n in
       let n = Z.to_int @@ snd n in
@@ -412,7 +412,7 @@ let rec simpl_expression (t:Raw.expr) : expr result =
     let n = Z.to_int @@ snd @@ n in
     return @@ e_literal ~loc (Literal_mutez n)
   )
-  | EArith (Neg e) -> simpl_unop "NEG" e
+  | EArith (Neg e) -> abstr_unop "NEG" e
   | EString (String s) ->
     let (s , loc) = r_split s in
       let s' =
@@ -422,17 +422,17 @@ let rec simpl_expression (t:Raw.expr) : expr result =
       return @@ e_literal ~loc (Literal_string s')
   | EString (Cat bo) ->
     let (bo , loc) = r_split bo in
-    let%bind sl = simpl_expression bo.arg1 in
-    let%bind sr = simpl_expression bo.arg2 in
+    let%bind sl = abstr_expression bo.arg1 in
+    let%bind sr = abstr_expression bo.arg2 in
     return @@ e_string_cat ~loc sl sr
-  | ELogic l -> simpl_logic_expression l
-  | EList l -> simpl_list_expression l
-  | ESet s -> simpl_set_expression s
+  | ELogic l -> abstr_logic_expression l
+  | EList l -> abstr_list_expression l
+  | ESet s -> abstr_set_expression s
   | ECond c ->
       let (c , loc) = r_split c in
-      let%bind expr = simpl_expression c.test in
-      let%bind match_true = simpl_expression c.ifso in
-      let%bind match_false = simpl_expression c.ifnot in
+      let%bind expr = abstr_expression c.test in
+      let%bind match_true = abstr_expression c.ifso in
+      let%bind match_false = abstr_expression c.ifnot in
       let match_expr = e_matching expr ~loc (Match_bool {match_true; match_false}) in
       let env = Var.fresh () in
       let%bind (_, match_expr) = repair_mutable_variable_in_matching match_expr [] env in
@@ -440,16 +440,16 @@ let rec simpl_expression (t:Raw.expr) : expr result =
 
   | ECase c -> (
       let (c , loc) = r_split c in
-      let%bind e = simpl_expression c.expr in
+      let%bind e = abstr_expression c.expr in
       let%bind lst =
         let aux (x : Raw.expr Raw.case_clause) =
-          let%bind expr = simpl_expression x.rhs in
+          let%bind expr = abstr_expression x.rhs in
           ok (x.pattern, expr) in
         bind_list
         @@ List.map aux
         @@ List.map get_value
         @@ npseq_to_list c.cases.value in
-      let%bind cases = simpl_cases lst in
+      let%bind cases = abstr_cases lst in
       let match_expr = e_matching ~loc e cases in
       let env = Var.fresh () in
       let%bind (_, match_expr) = repair_mutable_variable_in_matching match_expr [] env in
@@ -461,8 +461,8 @@ let rec simpl_expression (t:Raw.expr) : expr result =
         let lst = List.map get_value @@ pseq_to_list mi.elements in
         let aux : Raw.binding -> (expression * expression) result =
           fun b ->
-            let%bind src = simpl_expression b.source in
-            let%bind dst = simpl_expression b.image in
+            let%bind src = abstr_expression b.source in
+            let%bind dst = abstr_expression b.image in
             ok (src, dst) in
         bind_map_list aux lst in
       return @@ e_map ~loc lst
@@ -473,8 +473,8 @@ let rec simpl_expression (t:Raw.expr) : expr result =
         let lst = List.map get_value @@ pseq_to_list mi.elements in
         let aux : Raw.binding -> (expression * expression) result =
           fun b ->
-            let%bind src = simpl_expression b.source in
-            let%bind dst = simpl_expression b.image in
+            let%bind src = abstr_expression b.source in
+            let%bind dst = abstr_expression b.image in
             ok (src, dst) in
         bind_map_list aux lst in
       return @@ e_big_map ~loc lst
@@ -486,20 +486,20 @@ let rec simpl_expression (t:Raw.expr) : expr result =
             let (v , loc) = r_split v in
             return @@ e_variable ~loc (Var.of_name v)
           )
-        | Path p -> simpl_projection p
+        | Path p -> abstr_projection p
       in
-      let%bind index = simpl_expression lu.index.value.inside in
+      let%bind index = abstr_expression lu.index.value.inside in
       return @@ e_look_up ~loc path index
     )
   | EFun f ->
     let (f , loc) = r_split f in
-    let%bind (_ty_opt, f') = simpl_fun_expression ~loc f
+    let%bind (_ty_opt, f') = abstr_fun_expression ~loc f
     in return @@ f'
 
 
-and simpl_update = fun (u:Raw.update Region.reg) ->
+and abstr_update = fun (u:Raw.update Region.reg) ->
   let (u, loc) = r_split u in
-  let (name, path) = simpl_path u.record in
+  let (name, path) = abstr_path u.record in
   let record = match path with
   | [] -> e_variable (Var.of_name name)
   | _ -> e_accessor_list (e_variable (Var.of_name name)) path in 
@@ -507,7 +507,7 @@ and simpl_update = fun (u:Raw.update Region.reg) ->
   let%bind updates' =
     let aux (f:Raw.field_path_assign Raw.reg) =
       let (f,_) = r_split f in
-      let%bind expr = simpl_expression f.field_expr in
+      let%bind expr = abstr_expression f.field_expr in
         ok ( List.map (fun (x: _ Raw.reg) -> x.value) (npseq_to_list f.field_path), expr)
     in
     bind_map_list aux @@ npseq_to_list updates
@@ -523,7 +523,7 @@ and simpl_update = fun (u:Raw.update Region.reg) ->
     aux ur path in
   bind_fold_list aux record updates'
 
-and simpl_logic_expression (t:Raw.logic_expr) : expression result =
+and abstr_logic_expression (t:Raw.logic_expr) : expression result =
   let return x = ok x in
   match t with
   | BoolExpr (False reg) -> (
@@ -535,92 +535,92 @@ and simpl_logic_expression (t:Raw.logic_expr) : expression result =
       return @@ e_literal ~loc (Literal_bool true)
     )
   | BoolExpr (Or b) ->
-      simpl_binop "OR" b
+      abstr_binop "OR" b
   | BoolExpr (And b) ->
-      simpl_binop "AND" b
+      abstr_binop "AND" b
   | BoolExpr (Not b) ->
-      simpl_unop "NOT" b
+      abstr_unop "NOT" b
   | CompExpr (Lt c) ->
-      simpl_binop "LT" c
+      abstr_binop "LT" c
   | CompExpr (Gt c) ->
-      simpl_binop "GT" c
+      abstr_binop "GT" c
   | CompExpr (Leq c) ->
-      simpl_binop "LE" c
+      abstr_binop "LE" c
   | CompExpr (Geq c) ->
-      simpl_binop "GE" c
+      abstr_binop "GE" c
   | CompExpr (Equal c) ->
-      simpl_binop "EQ" c
+      abstr_binop "EQ" c
   | CompExpr (Neq c) ->
-      simpl_binop "NEQ" c
+      abstr_binop "NEQ" c
 
-and simpl_list_expression (t:Raw.list_expr) : expression result =
+and abstr_list_expression (t:Raw.list_expr) : expression result =
   let return x = ok x in
   match t with
     ECons c ->
-      simpl_binop "CONS" c
+      abstr_binop "CONS" c
   | EListComp lst ->
       let (lst , loc) = r_split lst in
       let%bind lst' =
-        bind_map_list simpl_expression @@
+        bind_map_list abstr_expression @@
         pseq_to_list lst.elements in
       return @@ e_list ~loc lst'
   | ENil reg ->
       let loc = Location.lift reg in
       return @@ e_list ~loc []
 
-and simpl_set_expression (t:Raw.set_expr) : expression result =
+and abstr_set_expression (t:Raw.set_expr) : expression result =
   match t with
   | SetMem x -> (
     let (x' , loc) = r_split x in
-    let%bind set' = simpl_expression x'.set in
-    let%bind element' = simpl_expression x'.element in
+    let%bind set' = abstr_expression x'.set in
+    let%bind element' = abstr_expression x'.element in
     ok @@ e_constant ~loc C_SET_MEM [ element' ; set' ]
   )
   | SetInj x -> (
     let (x' , loc) = r_split x in
     let elements = pseq_to_list x'.elements in
-    let%bind elements' = bind_map_list simpl_expression elements in
+    let%bind elements' = bind_map_list abstr_expression elements in
     ok @@ e_set ~loc elements'
   )
 
-and simpl_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
+and abstr_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
   let return x = ok x in
   let (t , loc) = r_split t in
-  let%bind a = simpl_expression t.arg1 in
-  let%bind b = simpl_expression t.arg2 in
+  let%bind a = abstr_expression t.arg1 in
+  let%bind b = abstr_expression t.arg2 in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ; b ]
 
-and simpl_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
+and abstr_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
   let return x = ok x in
   let (t , loc) = r_split t in
-  let%bind a = simpl_expression t.arg in
+  let%bind a = abstr_expression t.arg in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ]
 
-and simpl_tuple_expression ?loc (lst:Raw.expr list) : expression result =
+and abstr_tuple_expression ?loc (lst:Raw.expr list) : expression result =
   let return x = ok x in
   match lst with
   | [] -> return @@ e_literal Literal_unit
-  | [hd] -> simpl_expression hd
+  | [hd] -> abstr_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map simpl_expression lst
+      let%bind lst = bind_list @@ List.map abstr_expression lst
       in return @@ e_tuple ?loc lst
 
-and simpl_data_declaration : Raw.data_decl -> _ result =
+and abstr_data_declaration : Raw.data_decl -> _ result =
   fun t ->
   match t with
   | LocalVar x ->
       let (x , loc) = r_split x in
       let name = x.name.value in
-      let%bind t = simpl_type_expression x.var_type in
-      let%bind expression = simpl_expression x.init in
+      let%bind t = abstr_type_expression x.var_type in
+      let%bind expression = abstr_expression x.init in
       return_let_in ~loc (Var.of_name name, Some t) false false expression
   | LocalConst x ->
       let (x , loc) = r_split x in
       let name = x.name.value in
-      let%bind t = simpl_type_expression x.const_type in
-      let%bind expression = simpl_expression x.init in
+      let%bind t = abstr_type_expression x.const_type in
+      let%bind expression = abstr_expression x.init in
       let inline =
         match x.attributes with
           None -> false
@@ -630,7 +630,7 @@ and simpl_data_declaration : Raw.data_decl -> _ result =
       in return_let_in ~loc (Var.of_name name, Some t) false inline expression
   | LocalFun f  ->
       let (f , loc) = r_split f in
-      let%bind (binder, expr) = simpl_fun_decl ~loc f in
+      let%bind (binder, expr) = abstr_fun_decl ~loc f in
       let inline =
         match f.attributes with
           None -> false
@@ -639,22 +639,22 @@ and simpl_data_declaration : Raw.data_decl -> _ result =
            |> List.exists (fun Region.{value; _} -> value = "\"inline\"")
       in return_let_in ~loc binder false inline expr
 
-and simpl_param :
+and abstr_param :
       Raw.param_decl -> (string * type_expression) result =
   fun t ->
   match t with
   | ParamConst c ->
       let c = c.value in
       let param_name = c.var.value in
-      let%bind type_expression = simpl_type_expression c.param_type in
+      let%bind type_expression = abstr_type_expression c.param_type in
       ok (param_name , type_expression)
   | ParamVar v ->
       let c = v.value in
       let param_name = c.var.value in
-      let%bind type_expression = simpl_type_expression c.param_type in
+      let%bind type_expression = abstr_type_expression c.param_type in
       ok (param_name , type_expression)
 
-and simpl_fun_decl :
+and abstr_fun_decl :
       loc:_ -> Raw.fun_decl ->
       ((expression_variable * type_expression option) * expression) result =
   fun ~loc x ->
@@ -674,11 +674,11 @@ and simpl_fun_decl :
   in
   (match param.value.inside with
      a, [] -> (
-       let%bind input = simpl_param a in
+       let%bind input = abstr_param a in
        let (binder , input_type) = input in
-       let%bind instructions = simpl_statement_list statements in
-       let%bind result = simpl_expression return in
-       let%bind output_type = simpl_type_expression ret_type in
+       let%bind instructions = abstr_statement_list statements in
+       let%bind result = abstr_expression return in
+       let%bind output_type = abstr_type_expression ret_type in
        let body = instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -699,7 +699,7 @@ and simpl_fun_decl :
        let lst = npseq_to_list lst in
        (* TODO wrong, should be fresh? *)
        let arguments_name = Var.of_name "arguments" in
-       let%bind params = bind_map_list simpl_param lst in
+       let%bind params = bind_map_list abstr_param lst in
        let (binder , input_type) =
          let type_expression = t_tuple (List.map snd params) in
          (arguments_name , type_expression) in
@@ -712,9 +712,9 @@ and simpl_fun_decl :
            ass
          in
          bind_list @@ List.mapi aux params in
-       let%bind instructions = simpl_statement_list statements in
-       let%bind result = simpl_expression return in
-       let%bind output_type = simpl_type_expression ret_type in
+       let%bind instructions = abstr_statement_list statements in
+       let%bind result = abstr_expression return in
+       let%bind output_type = abstr_type_expression ret_type in
        let body = tpl_declarations @ instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -732,7 +732,7 @@ and simpl_fun_decl :
      )
   )
 
-and simpl_fun_expression :
+and abstr_fun_expression :
   loc:_ -> Raw.fun_expr -> (type_expression option * expression) result =
   fun ~loc x ->
   let open! Raw in
@@ -740,11 +740,12 @@ and simpl_fun_expression :
   let statements = [] in
   (match param.value.inside with
     a, [] -> (
-        let%bind input = simpl_param a in
+        let%bind input = abstr_param a in
         let (binder , input_type) = input in
-        let%bind instructions = simpl_statement_list statements in
-        let%bind result = simpl_expression return in
-        let%bind output_type = simpl_type_expression ret_type in
+        let%bind instructions = abstr_statement_list statements in
+        let%bind result = abstr_expression return in
+        let%bind output_type = abstr_type_expression ret_type in
+
         let body = instructions in
         let%bind result =
           let aux prec cur = cur (Some prec) in
@@ -762,7 +763,7 @@ and simpl_fun_expression :
        let lst = npseq_to_list lst in
        (* TODO wrong, should be fresh? *)
        let arguments_name = Var.of_name "arguments" in
-       let%bind params = bind_map_list simpl_param lst in
+       let%bind params = bind_map_list abstr_param lst in
        let (binder , input_type) =
          let type_expression = t_tuple (List.map snd params) in
          (arguments_name , type_expression) in
@@ -774,9 +775,9 @@ and simpl_fun_expression :
            ass
          in
          bind_list @@ List.mapi aux params in
-       let%bind instructions = simpl_statement_list statements in
-       let%bind result = simpl_expression return in
-       let%bind output_type = simpl_type_expression ret_type in
+       let%bind instructions = abstr_statement_list statements in
+       let%bind result = abstr_expression return in
+       let%bind output_type = abstr_type_expression ret_type in
        let body = tpl_declarations @ instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -791,7 +792,7 @@ and simpl_fun_expression :
      )
   )
 
-and simpl_statement_list statements =
+and abstr_statement_list statements =
   let open Raw in
   let rec hook acc = function
     [] -> acc
@@ -813,9 +814,9 @@ and simpl_statement_list statements =
       (* Detached attributes are erased. TODO: Warning. *)
       hook acc statements
   | Instr i :: statements ->
-      hook (simpl_instruction i :: acc) statements
+      hook (abstr_instruction i :: acc) statements
   | Data d :: statements ->
-      hook (simpl_data_declaration d :: acc) statements
+      hook (abstr_data_declaration d :: acc) statements
   in bind_list @@ hook [] (List.rev statements)
 
 and get_case_variables (t:Raw.pattern) : expression_variable list result = 
@@ -847,7 +848,7 @@ and get_case_variables (t:Raw.pattern) : expression_variable list result =
     | PVar  v -> ok @@ [Var.of_name v.value] 
     | p -> fail @@ unsupported_cst_constr p
 
-and simpl_single_instruction : Raw.instruction -> (_ -> expression result) result =
+and abstr_single_instruction : Raw.instruction -> (_ -> expression result) result =
   fun t ->
   match t with
   | ProcCall x -> (
@@ -859,15 +860,15 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let (f_name , f_loc) = r_split name in
       match constants f_name with
       | Error _  ->
-         let%bind arg = simpl_tuple_expression ~loc:args_loc args' in
+         let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
          return_statement @@ e_application ~loc (e_variable ~loc:f_loc (Var.of_name f_name)) arg
       | Ok (s,_) ->
-         let%bind lst = bind_map_list simpl_expression args' in
+         let%bind lst = bind_map_list abstr_expression args' in
          return_statement @@ e_constant ~loc s lst
     )
     | f -> (
-      let%bind f' = simpl_expression f in
-      let%bind arg = simpl_tuple_expression ~loc:args_loc args' in
+      let%bind f' = abstr_expression f in
+      let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
       return_statement @@ e_application ~loc f' arg
     )
   )
@@ -876,35 +877,35 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
       return_statement @@ e_skip ~loc ()
     )
   | Loop (While l) ->
-      simpl_while_loop l.value
+      abstr_while_loop l.value
   | Loop (For (ForInt fi)) -> (
-      let%bind loop = simpl_for_int fi.value in
+      let%bind loop = abstr_for_int fi.value in
       ok loop
   )
   | Loop (For (ForCollect fc)) ->
-      let%bind loop = simpl_for_collect fc.value in
+      let%bind loop = abstr_for_collect fc.value in
       ok loop
   | Cond c -> (
       let (c , loc) = r_split c in
-      let%bind expr = simpl_expression c.test in
+      let%bind expr = abstr_expression c.test in
       let%bind match_true = match c.ifso with
           ClauseInstr i ->
-            simpl_single_instruction i
+            abstr_single_instruction i
         | ClauseBlock b ->
             match b with
               LongBlock {value; _} ->
-                simpl_block value
+                abstr_block value
             | ShortBlock {value; _} ->
-                simpl_statements @@ fst value.inside in
+                abstr_statements @@ fst value.inside in
       let%bind match_false = match c.ifnot with
           ClauseInstr i ->
-            simpl_single_instruction i
+            abstr_single_instruction i
         | ClauseBlock b ->
             match b with
               LongBlock {value; _} ->
-                simpl_block value
+                abstr_block value
             | ShortBlock {value; _} ->
-                simpl_statements @@ fst value.inside in
+                abstr_statements @@ fst value.inside in
       let env = Var.fresh () in
       
       let%bind match_true' = match_true None in
@@ -928,10 +929,10 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | Assign a -> (
       let (a , loc) = r_split a in
-      let%bind value_expr = simpl_expression a.rhs in
+      let%bind value_expr = abstr_expression a.rhs in
       match a.lhs with
         | Path path -> (
-            let (name , path') = simpl_path path in
+            let (name , path') = abstr_path path in
             let (let_binder, mut, rhs, inline) = e_assign_with_let ~loc name path' value_expr in
             return_let_in let_binder mut inline rhs
           )
@@ -940,11 +941,11 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
             let%bind (varname,map,path) = match v'.path with
               | Name name -> ok (name.value , e_variable (Var.of_name name.value), [])
               | Path p ->
-                let (name,p') = simpl_path v'.path in
-                let%bind accessor = simpl_projection p in
+                let (name,p') = abstr_path v'.path in
+                let%bind accessor = abstr_projection p in
                 ok @@ (name , accessor , p')
             in
-            let%bind key_expr = simpl_expression v'.index.value.inside in
+            let%bind key_expr = abstr_expression v'.index.value.inside in
             let expr' = e_map_add key_expr value_expr map in
             let (let_binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr' in
             return_let_in let_binder mut inline rhs  
@@ -952,20 +953,20 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | CaseInstr c -> (
       let (c , loc) = r_split c in
-      let%bind expr = simpl_expression c.expr in
+      let%bind expr = abstr_expression c.expr in
       let env = Var.fresh () in
       let%bind (fv,cases) =
         let aux fv (x : Raw.if_clause Raw.case_clause Raw.reg) =
           let%bind case_clause =
             match x.value.rhs with
               ClauseInstr i ->
-                simpl_single_instruction i
+                abstr_single_instruction i
             | ClauseBlock b ->
                 match b with
                   LongBlock {value; _} ->
-                    simpl_block value
+                    abstr_block value
                 | ShortBlock {value; _} ->
-                  simpl_statements @@ fst value.inside in
+                  abstr_statements @@ fst value.inside in
           let%bind case_clause'= case_clause @@ None in
           let%bind case_clause = case_clause @@ Some(e_variable env) in
           let%bind case_vars   = get_case_variables x.value.pattern in
@@ -975,11 +976,11 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let free_vars = List.concat fv in
       if (List.length free_vars == 0) then (
         let cases = List.map (fun case -> let (a,_,b) = case in (a,b)) cases in
-        let%bind m = simpl_cases cases in
+        let%bind m = abstr_cases cases in
         return_statement @@ e_matching ~loc expr m
       ) else (
         let cases = List.map (fun case -> let (a,b,_) = case in (a,b)) cases in
-        let%bind m = simpl_cases cases in
+        let%bind m = abstr_cases cases in
         let match_expr = e_matching ~loc expr m in
         let return_expr = fun expr ->
           e_let_in (env,None) false false (store_mutable_variable free_vars) @@
@@ -1001,8 +1002,8 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
         region=r.record_inj.region
         } in
       let u : Raw.update = {record=r.path;kwd_with=r.kwd_with; updates=update} in
-      let%bind expr = simpl_update {value=u;region=reg} in
-      let (name , access_path) = simpl_path r.path in
+      let%bind expr = abstr_update {value=u;region=reg} in
+      let (name , access_path) = abstr_path r.path in
       let loc = Some loc in
       let (binder, mut, rhs, inline) = e_assign_with_let ?loc name access_path expr in
       return_let_in binder mut inline rhs
@@ -1010,13 +1011,13 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
   )
   | MapPatch patch -> (
       let (map_p, loc) = r_split patch in
-      let (name, access_path) = simpl_path map_p.path in
+      let (name, access_path) = abstr_path map_p.path in
       let%bind inj = bind_list
           @@ List.map (fun (x:Raw.binding Region.reg) ->
             let x = x.value in
             let (key, value) = x.source, x.image in
-            let%bind key' = simpl_expression key in
-            let%bind value' = simpl_expression value
+            let%bind key' = abstr_expression key in
+            let%bind value' = abstr_expression value
             in ok @@ (key', value')
           )
         @@ npseq_to_list map_p.map_inj.value.ne_elements in
@@ -1033,10 +1034,10 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | SetPatch patch -> (
       let (setp, loc) = r_split patch in
-      let (name , access_path) = simpl_path setp.path in
+      let (name , access_path) = abstr_path setp.path in
       let%bind inj =
         bind_list @@
-        List.map simpl_expression @@
+        List.map abstr_expression @@
         npseq_to_list setp.set_inj.value.ne_elements in
       match inj with
       | [] -> return_statement @@ e_skip ~loc ()
@@ -1053,11 +1054,11 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let%bind (varname,map,path) = match v.map with
         | Name v -> ok (v.value , e_variable (Var.of_name v.value) , [])
         | Path p ->
-          let (name,p') = simpl_path v.map in
-          let%bind accessor = simpl_projection p in
+          let (name,p') = abstr_path v.map in
+          let%bind accessor = abstr_projection p in
           ok @@ (name , accessor , p')
       in
-      let%bind key' = simpl_expression key in
+      let%bind key' = abstr_expression key in
       let expr = e_constant ~loc C_MAP_REMOVE [key' ; map] in
       let (binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr in
       return_let_in binder mut inline rhs
@@ -1067,17 +1068,17 @@ and simpl_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let%bind (varname, set, path) = match set_rm.set with
         | Name v -> ok (v.value, e_variable (Var.of_name v.value), [])
         | Path path ->
-          let(name, p') = simpl_path set_rm.set in
-          let%bind accessor = simpl_projection path in
+          let(name, p') = abstr_path set_rm.set in
+          let%bind accessor = abstr_projection path in
           ok @@ (name, accessor, p')
       in
-      let%bind removed' = simpl_expression set_rm.element in
+      let%bind removed' = abstr_expression set_rm.element in
       let expr = e_constant ~loc C_SET_REMOVE [removed' ; set] in
       let (binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr in
       return_let_in binder mut inline rhs
     )
 
-and simpl_path : Raw.path -> string * string list = fun p ->
+and abstr_path : Raw.path -> string * string list = fun p ->
   match p with
   | Raw.Name v -> (v.value , [])
   | Raw.Path p -> (
@@ -1094,7 +1095,7 @@ and simpl_path : Raw.path -> string * string list = fun p ->
       (var , path')
     )
 
-and simpl_cases : (Raw.pattern * expression) list -> matching_expr result = fun t ->
+and abstr_cases : (Raw.pattern * expression) list -> matching_expr result = fun t ->
   let open Raw in
   let get_var (t:Raw.pattern) =
     match t with
@@ -1185,13 +1186,13 @@ and simpl_cases : (Raw.pattern * expression) list -> matching_expr result = fun
         bind_map_list aux lst in
       ok @@ ez_match_variant constrs
 
-and simpl_instruction : Raw.instruction -> (_ -> expression result) result =
-  fun t -> trace (simplifying_instruction t) @@ simpl_single_instruction t
+and abstr_instruction : Raw.instruction -> (_ -> expression result) result =
+  fun t -> trace (abstracting_instruction t) @@ abstr_single_instruction t
 
-and simpl_statements : Raw.statements -> (_ -> expression result) result =
+and abstr_statements : Raw.statements -> (_ -> expression result) result =
   fun statements ->
     let lst = npseq_to_list statements in
-    let%bind fs = simpl_statement_list lst in
+    let%bind fs = abstr_statement_list lst in
     let aux : _ -> (expression option -> expression result) -> _ =
       fun prec cur ->
         let%bind res = cur prec
@@ -1200,19 +1201,19 @@ and simpl_statements : Raw.statements -> (_ -> expression result) result =
            let%bind ret = bind_fold_right_list aux expr' fs in
            ok @@ Option.unopt_exn ret
 
-and simpl_block : Raw.block -> (_ -> expression result) result =
-  fun t -> simpl_statements t.statements
+and abstr_block : Raw.block -> (_ -> expression result) result =
+  fun t -> abstr_statements t.statements
 
-and simpl_while_loop : Raw.while_loop -> (_ -> expression result) result = fun wl ->
+and abstr_while_loop : Raw.while_loop -> (_ -> expression result) result = fun wl ->
   let env_rec = Var.fresh () in
   let binder  = Var.fresh () in
 
-  let%bind cond = simpl_expression wl.cond in
+  let%bind cond = abstr_expression wl.cond in
   let ctrl = 
     (e_variable binder)
   in
 
-  let%bind for_body = simpl_block wl.block.value in
+  let%bind for_body = abstr_block wl.block.value in
   let%bind for_body = for_body @@ Some( ctrl ) in
   let%bind ((_,captured_name_list),for_body) = repair_mutable_variable_in_loops for_body [] binder in
 
@@ -1237,15 +1238,15 @@ and simpl_while_loop : Raw.while_loop -> (_ -> expression result) result = fun w
   restore_mutable_variable return_expr captured_name_list env_rec 
 
 
-and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
+and abstr_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   let env_rec = Var.fresh () in
   let binder  = Var.fresh () in
   let name = fi.assign.value.name.value in
   let it = Var.of_name name in
   let var = e_variable it in
   (*Make the cond and the step *)
-  let%bind value = simpl_expression fi.assign.value.expr in
-  let%bind bound = simpl_expression fi.bound in
+  let%bind value = abstr_expression fi.assign.value.expr in
+  let%bind bound = abstr_expression fi.bound in
   let cond = e_annotation (e_constant C_LE [var ; bound]) t_bool in
   let step = e_int 1 in
   let continue_expr = e_constant C_FOLD_CONTINUE [(e_variable binder)] in
@@ -1255,7 +1256,7 @@ and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
     continue_expr
   in
   (* Modify the body loop*)
-  let%bind for_body = simpl_block fi.block.value in
+  let%bind for_body = abstr_block fi.block.value in
   let%bind for_body = for_body @@ Some ctrl in
   let%bind ((_,captured_name_list),for_body) = repair_mutable_variable_in_loops for_body [it] binder in
 
@@ -1285,19 +1286,19 @@ and simpl_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   in
   restore_mutable_variable return_expr captured_name_list env_rec 
 
-and simpl_for_collect : Raw.for_collect -> (_ -> expression result) result = fun fc ->
+and abstr_for_collect : Raw.for_collect -> (_ -> expression result) result = fun fc ->
   let binder = Var.of_name "arguments" in
   let%bind element_names = ok @@ match fc.bind_to with
     | Some v -> [Var.of_name fc.var.value;Var.of_name (snd v).value]
     | None -> [Var.of_name fc.var.value] in
   
   let env = Var.fresh () in
-  let%bind for_body = simpl_block fc.block.value in
+  let%bind for_body = abstr_block fc.block.value in
   let%bind for_body = for_body @@ Some (e_accessor (e_variable binder) "0") in
   let%bind ((_,free_vars), for_body) = repair_mutable_variable_in_loops for_body element_names binder in
 
   let init_record = store_mutable_variable free_vars in
-  let%bind collect = simpl_expression fc.expr in
+  let%bind collect = abstr_expression fc.expr in
   let aux name expr=
     e_let_in (name,None) false false (e_accessor (e_accessor (e_variable binder) "0") (Var.to_name name)) expr
   in
@@ -1319,8 +1320,7 @@ and simpl_for_collect : Raw.for_collect -> (_ -> expression result) result = fun
   in
   restore_mutable_variable fold free_vars env
 
-and simpl_declaration_list declarations :
-  Ast_simplified.declaration Location.wrap list result =
+and abstr_declaration_list declarations : declaration Location.wrap list result =
   let open Raw in
   let rec hook acc = function
     [] -> acc
@@ -1344,16 +1344,16 @@ and simpl_declaration_list declarations :
   | TypeDecl decl :: declarations ->
       let decl, loc = r_split decl in
       let {name; type_expr} : Raw.type_decl = decl in
-      let%bind type_expression = simpl_type_expression type_expr in
+      let%bind type_expression = abstr_type_expression type_expr in
       let new_decl =
         Declaration_type (Var.of_name name.value, type_expression) in
       let res = Location.wrap ~loc new_decl in
       hook (bind_list_cons res acc) declarations
   | ConstDecl decl :: declarations ->
-      let simpl_const_decl =
+      let abstr_const_decl =
         fun {name;const_type; init; attributes} ->
-          let%bind expression = simpl_expression init in
-          let%bind t = simpl_type_expression const_type in
+          let%bind expression = abstr_expression init in
+          let%bind t = abstr_type_expression const_type in
           let type_annotation = Some t in
           let inline =
             match attributes with
@@ -1366,11 +1366,11 @@ and simpl_declaration_list declarations :
               (Var.of_name name.value, type_annotation, inline, expression)
           in ok new_decl in
       let%bind res =
-        bind_map_location simpl_const_decl (Location.lift_region decl)
+        bind_map_location abstr_const_decl (Location.lift_region decl)
       in hook (bind_list_cons res acc) declarations
   | FunDecl fun_decl :: declarations ->
       let decl, loc = r_split fun_decl in
-      let%bind ((name, ty_opt), expr) = simpl_fun_decl ~loc decl in
+      let%bind ((name, ty_opt), expr) = abstr_fun_decl ~loc decl in
       let inline =
         match fun_decl.value.attributes with
           None -> false
@@ -1383,5 +1383,5 @@ and simpl_declaration_list declarations :
       hook (bind_list_cons res acc) declarations
   in hook (ok @@ []) (List.rev declarations)
 
-let simpl_program : Raw.ast -> program result =
-  fun t -> simpl_declaration_list @@ nseq_to_list t.decl
+let abstr_program : Raw.ast -> program result =
+  fun t -> abstr_declaration_list @@ nseq_to_list t.decl
diff --git a/src/passes/2-simplify/pascaligo.mli b/src/passes/2-abstracter/pascaligo.mli
similarity index 76%
rename from src/passes/2-simplify/pascaligo.mli
rename to src/passes/2-abstracter/pascaligo.mli
index 42e5e4afe..652c77d99 100644
--- a/src/passes/2-simplify/pascaligo.mli
+++ b/src/passes/2-abstracter/pascaligo.mli
@@ -1,15 +1,15 @@
 (** Converts PascaLIGO programs to the Simplified Abstract Syntax Tree. *)
 
 open Trace
-open Ast_simplified
+open Ast_imperative
 
 module Raw = Parser.Pascaligo.AST
 module SMap = Map.String
 
 (** Convert a concrete PascaLIGO expression AST to the simplified
     expression AST used by the compiler. *)
-val simpl_expression : Raw.expr -> expr result
+val abstr_expression : Raw.expr -> expr result
 
 (** Convert a concrete PascaLIGO program AST to the simplified program
     AST used by the compiler. *)
-val simpl_program : Raw.ast -> program result
+val abstr_program : Raw.ast -> program result
diff --git a/src/passes/3-self_ast_imperative/dune b/src/passes/3-self_ast_imperative/dune
new file mode 100644
index 000000000..2b1e5f8b5
--- /dev/null
+++ b/src/passes/3-self_ast_imperative/dune
@@ -0,0 +1,13 @@
+(library
+  (name self_ast_imperative)
+  (public_name ligo.self_ast_imperative)
+  (libraries
+    simple-utils
+    ast_imperative
+    proto-alpha-utils
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -w +1..62-4-9-44-40-42-48-30@39@33 -open Simple_utils ))
+)
diff --git a/src/passes/3-self_ast_simplified/entrypoints_lenght_limit.ml b/src/passes/3-self_ast_imperative/entrypoints_lenght_limit.ml
similarity index 97%
rename from src/passes/3-self_ast_simplified/entrypoints_lenght_limit.ml
rename to src/passes/3-self_ast_imperative/entrypoints_lenght_limit.ml
index a64007b4a..f2d5fc202 100644
--- a/src/passes/3-self_ast_simplified/entrypoints_lenght_limit.ml
+++ b/src/passes/3-self_ast_imperative/entrypoints_lenght_limit.ml
@@ -1,4 +1,4 @@
-open Ast_simplified
+open Ast_imperative
 open Trace
 open Stage_common.Helpers
 
diff --git a/src/passes/3-self_ast_simplified/helpers.ml b/src/passes/3-self_ast_imperative/helpers.ml
similarity index 99%
rename from src/passes/3-self_ast_simplified/helpers.ml
rename to src/passes/3-self_ast_imperative/helpers.ml
index 101f8d9ab..22e426700 100644
--- a/src/passes/3-self_ast_simplified/helpers.ml
+++ b/src/passes/3-self_ast_imperative/helpers.ml
@@ -1,4 +1,4 @@
-open Ast_simplified
+open Ast_imperative
 open Trace
 open Stage_common.Helpers
 
diff --git a/src/passes/3-self_ast_simplified/literals.ml b/src/passes/3-self_ast_imperative/literals.ml
similarity index 98%
rename from src/passes/3-self_ast_simplified/literals.ml
rename to src/passes/3-self_ast_imperative/literals.ml
index 367e9787f..96914359a 100644
--- a/src/passes/3-self_ast_simplified/literals.ml
+++ b/src/passes/3-self_ast_imperative/literals.ml
@@ -1,4 +1,4 @@
-open Ast_simplified
+open Ast_imperative
 open Trace
 open Proto_alpha_utils
 
@@ -6,7 +6,7 @@ module Errors = struct
 
   let bad_format e () =
     let title = (thunk ("Badly formatted literal")) in
-    let message () = Format.asprintf "%a" Ast_simplified.PP.expression e in
+    let message () = Format.asprintf "%a" PP.expression e in
     let data = [
       ("location" , fun () -> Format.asprintf "%a" Location.pp e.location)
     ] in
diff --git a/src/passes/3-self_ast_simplified/none_variant.ml b/src/passes/3-self_ast_imperative/none_variant.ml
similarity index 95%
rename from src/passes/3-self_ast_simplified/none_variant.ml
rename to src/passes/3-self_ast_imperative/none_variant.ml
index 416142f0f..894d55830 100644
--- a/src/passes/3-self_ast_simplified/none_variant.ml
+++ b/src/passes/3-self_ast_imperative/none_variant.ml
@@ -1,4 +1,4 @@
-open Ast_simplified
+open Ast_imperative
 open Trace
 
 let peephole_expression : expression -> expression result = fun e ->
diff --git a/src/passes/3-self_ast_simplified/self_ast_simplified.ml b/src/passes/3-self_ast_imperative/self_ast_imperative.ml
similarity index 100%
rename from src/passes/3-self_ast_simplified/self_ast_simplified.ml
rename to src/passes/3-self_ast_imperative/self_ast_imperative.ml
diff --git a/src/passes/3-self_ast_simplified/tezos_type_annotation.ml b/src/passes/3-self_ast_imperative/tezos_type_annotation.ml
similarity index 98%
rename from src/passes/3-self_ast_simplified/tezos_type_annotation.ml
rename to src/passes/3-self_ast_imperative/tezos_type_annotation.ml
index cc6557ae2..19118f125 100644
--- a/src/passes/3-self_ast_simplified/tezos_type_annotation.ml
+++ b/src/passes/3-self_ast_imperative/tezos_type_annotation.ml
@@ -1,4 +1,4 @@
-open Ast_simplified
+open Ast_imperative
 open Trace
 
 module Errors = struct
diff --git a/src/passes/4-Instruction_remover/dune b/src/passes/4-Instruction_remover/dune
new file mode 100644
index 000000000..eb702bf26
--- /dev/null
+++ b/src/passes/4-Instruction_remover/dune
@@ -0,0 +1,14 @@
+(library
+  (name instruction_remover)
+  (public_name ligo.instruction_remover)
+  (libraries
+    simple-utils
+    ast_imperative
+    ast_complex
+    proto-alpha-utils
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -w +1..62-4-9-44-40-42-48-30@39@33 -open Simple_utils ))
+)
diff --git a/src/passes/4-Instruction_remover/instruction_remover.ml b/src/passes/4-Instruction_remover/instruction_remover.ml
new file mode 100644
index 000000000..816ed47b9
--- /dev/null
+++ b/src/passes/4-Instruction_remover/instruction_remover.ml
@@ -0,0 +1,186 @@
+module I = Ast_imperative
+module O = Ast_complex
+open Trace
+
+let rec idle_type_expression : I.type_expression -> O.type_expression result =
+  fun te ->
+  let return te = ok @@ O.make_t te in
+  match te.type_content with
+    | I.T_sum sum -> 
+      let sum = I.CMap.to_kv_list sum in
+      let%bind sum = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = idle_type_expression v in
+          ok @@ (k,v)
+        ) sum
+      in
+      return @@ O.T_sum (O.CMap.of_list sum)
+    | I.T_record record -> 
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = idle_type_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ O.T_record (O.LMap.of_list record)
+    | I.T_arrow {type1;type2} ->
+      let%bind type1 = idle_type_expression type1 in
+      let%bind type2 = idle_type_expression type2 in
+      return @@ T_arrow {type1;type2}
+    | I.T_variable type_variable -> return @@ T_variable type_variable 
+    | I.T_constant type_constant -> return @@ T_constant type_constant
+    | I.T_operator type_operator ->
+      let%bind type_operator = idle_type_operator type_operator in
+      return @@ T_operator type_operator
+
+and idle_type_operator : I.type_operator -> O.type_operator result =
+  fun t_o ->
+  match t_o with
+    | TC_contract c -> 
+      let%bind c = idle_type_expression c in
+      ok @@ O.TC_contract c
+    | TC_option o ->
+      let%bind o = idle_type_expression o in
+      ok @@ O.TC_option o
+    | TC_list l ->
+      let%bind l = idle_type_expression l in
+      ok @@ O.TC_list l
+    | TC_set s ->
+      let%bind s = idle_type_expression s in
+      ok @@ O.TC_set s
+    | TC_map (k,v) ->
+      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      ok @@ O.TC_map (k,v)
+    | TC_big_map (k,v) ->
+      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      ok @@ O.TC_big_map (k,v)
+    | TC_arrow (i,o) ->
+      let%bind (i,o) = bind_map_pair idle_type_expression (i,o) in
+      ok @@ O.TC_arrow (i,o)
+
+let rec remove_instruction_in_expression : I.expression -> O.expression result =
+  fun e ->
+  let return expr = ok @@ O.make_expr ~loc:e.location expr in
+  match e.expression_content with
+    | I.E_literal literal   -> return @@ O.E_literal literal
+    | I.E_constant {cons_name;arguments} -> 
+      let%bind arguments = bind_map_list remove_instruction_in_expression arguments in
+      return @@ O.E_constant {cons_name;arguments}
+    | I.E_variable name     -> return @@ O.E_variable name
+    | I.E_application {expr1;expr2} -> 
+      let%bind expr1 = remove_instruction_in_expression expr1 in
+      let%bind expr2 = remove_instruction_in_expression expr2 in
+      return @@ O.E_application {expr1; expr2}
+    | I.E_lambda lambda ->
+      let%bind lambda = remove_instruction_in_lambda lambda in
+      return @@ O.E_lambda lambda
+    | I.E_recursive {fun_name;fun_type;lambda} ->
+      let%bind fun_type = idle_type_expression fun_type in
+      let%bind lambda = remove_instruction_in_lambda lambda in
+      return @@ O.E_recursive {fun_name;fun_type;lambda}
+    | I.E_let_in {let_binder;mut=_;inline;rhs;let_result} ->
+      let (binder,ty_opt) = let_binder in
+      let%bind ty_opt = bind_map_option idle_type_expression ty_opt in
+      let%bind rhs = remove_instruction_in_expression rhs in
+      let%bind let_result = remove_instruction_in_expression let_result in
+      return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
+    | I.E_skip -> return @@ O.E_skip
+    | I.E_constructor {constructor;element} ->
+      let%bind element = remove_instruction_in_expression element in
+      return @@ O.E_constructor {constructor;element}
+    | I.E_matching {matchee; cases} ->
+      let%bind matchee = remove_instruction_in_expression matchee in
+      let%bind cases   = remove_instruction_in_matching cases in
+      return @@ O.E_matching {matchee;cases}
+    | I.E_record record ->
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v =remove_instruction_in_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ O.E_record (O.LMap.of_list record)
+    | I.E_record_accessor {expr;label} ->
+      let%bind expr = remove_instruction_in_expression expr in
+      return @@ O.E_record_accessor {expr;label}
+    | I.E_record_update {record;path;update} ->
+      let%bind record = remove_instruction_in_expression record in
+      let%bind update = remove_instruction_in_expression update in
+      return @@ O.E_record_update {record;path;update}
+    | I.E_map map ->
+      let%bind map = bind_map_list (
+        bind_map_pair remove_instruction_in_expression
+      ) map
+      in
+      return @@ O.E_map map
+    | I.E_big_map big_map ->
+      let%bind big_map = bind_map_list (
+        bind_map_pair remove_instruction_in_expression
+      ) big_map
+      in
+      return @@ O.E_big_map big_map
+    | I.E_list lst ->
+      let%bind lst = bind_map_list remove_instruction_in_expression lst in
+      return @@ O.E_list lst
+    | I.E_set set ->
+      let%bind set = bind_map_list remove_instruction_in_expression set in
+      return @@ O.E_set set 
+    | I.E_look_up look_up ->
+      let%bind look_up = bind_map_pair remove_instruction_in_expression look_up in
+      return @@ O.E_look_up look_up
+    | I.E_ascription {anno_expr; type_annotation} ->
+      let%bind anno_expr = remove_instruction_in_expression anno_expr in
+      let%bind type_annotation = idle_type_expression type_annotation in
+      return @@ O.E_ascription {anno_expr; type_annotation}
+and remove_instruction_in_lambda : I.lambda -> O.lambda result =
+  fun {binder;input_type;output_type;result}->
+    let%bind input_type = bind_map_option idle_type_expression input_type in
+    let%bind output_type = bind_map_option idle_type_expression output_type in
+    let%bind result = remove_instruction_in_expression result in
+    ok @@ O.{binder;input_type;output_type;result}
+and remove_instruction_in_matching : I.matching_expr -> O.matching_expr result =
+  fun m -> 
+  match m with 
+    | I.Match_bool {match_true;match_false} ->
+      let%bind match_true = remove_instruction_in_expression match_true in
+      let%bind match_false = remove_instruction_in_expression match_false in
+      ok @@ O.Match_bool {match_true;match_false}
+    | I.Match_list {match_nil;match_cons} ->
+      let%bind match_nil = remove_instruction_in_expression match_nil in
+      let (hd,tl,expr,tv) = match_cons in
+      let%bind expr = remove_instruction_in_expression expr in
+      ok @@ O.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
+    | I.Match_option {match_none;match_some} ->
+      let%bind match_none = remove_instruction_in_expression match_none in
+      let (n,expr,tv) = match_some in
+      let%bind expr = remove_instruction_in_expression expr in
+      ok @@ O.Match_option {match_none; match_some=(n,expr,tv)}
+    | I.Match_tuple ((lst,expr), tv) ->
+      let%bind expr = remove_instruction_in_expression expr in
+      ok @@ O.Match_tuple ((lst,expr), tv)
+    | I.Match_variant (lst,tv) ->
+      let%bind lst = bind_map_list (
+        fun ((c,n),expr) ->
+          let%bind expr = remove_instruction_in_expression expr in
+          ok @@ ((c,n),expr)
+      ) lst 
+      in
+      ok @@ O.Match_variant (lst,tv)
+ 
+let remove_instruction_in_declaration : I.declaration Location.wrap -> _ =
+  fun {wrap_content=declaration;location} ->
+  let return decl = ok @@ Location.wrap ~loc:location decl in
+  match declaration with 
+  | I.Declaration_constant (n, te_opt, inline, expr) ->
+    let%bind expr = remove_instruction_in_expression expr in
+    let%bind te_opt = bind_map_option idle_type_expression te_opt in
+    return @@ O.Declaration_constant (n, te_opt, inline, expr)
+  | I.Declaration_type (n, te) ->
+    let%bind te = idle_type_expression te in
+    return @@ O.Declaration_type (n,te)
+
+let remove_instruction_in_program : I.program -> O.program result =
+  fun p ->
+  bind_map_list remove_instruction_in_declaration p
diff --git a/src/passes/5-self_ast_complex/dune b/src/passes/5-self_ast_complex/dune
new file mode 100644
index 000000000..819a5ad1f
--- /dev/null
+++ b/src/passes/5-self_ast_complex/dune
@@ -0,0 +1,13 @@
+(library
+  (name self_ast_complex)
+  (public_name ligo.self_ast_complex)
+  (libraries
+    simple-utils
+    ast_complex
+    proto-alpha-utils
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -w +1..62-4-9-44-40-42-48-30@39@33 -open Simple_utils ))
+)
diff --git a/src/passes/5-self_ast_typed/main.ml b/src/passes/5-self_ast_typed/main.ml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/passes/6-simplifier/dune b/src/passes/6-simplifier/dune
new file mode 100644
index 000000000..a693dcd19
--- /dev/null
+++ b/src/passes/6-simplifier/dune
@@ -0,0 +1,14 @@
+(library
+  (name simplifier)
+  (public_name ligo.simplifier)
+  (libraries
+    simple-utils
+    ast_complex
+    ast_simplified
+    proto-alpha-utils
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -w +1..62-4-9-44-40-42-48-30@39@33 -open Simple_utils ))
+)
diff --git a/src/passes/6-simplifier/simplifier.ml b/src/passes/6-simplifier/simplifier.ml
new file mode 100644
index 000000000..fd396705e
--- /dev/null
+++ b/src/passes/6-simplifier/simplifier.ml
@@ -0,0 +1,187 @@
+module I = Ast_complex
+module O = Ast_simplified
+open Trace
+
+let rec idle_type_expression : I.type_expression -> O.type_expression result =
+  fun te ->
+  let return te = ok @@ O.make_t te in
+  match te.type_content with
+    | I.T_sum sum -> 
+      let sum = I.CMap.to_kv_list sum in
+      let%bind sum = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = idle_type_expression v in
+          ok @@ (k,v)
+        ) sum
+      in
+      return @@ O.T_sum (O.CMap.of_list sum)
+    | I.T_record record -> 
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = idle_type_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ O.T_record (O.LMap.of_list record)
+    | I.T_arrow {type1;type2} ->
+      let%bind type1 = idle_type_expression type1 in
+      let%bind type2 = idle_type_expression type2 in
+      return @@ T_arrow {type1;type2}
+    | I.T_variable type_variable -> return @@ T_variable type_variable 
+    | I.T_constant type_constant -> return @@ T_constant type_constant
+    | I.T_operator type_operator ->
+      let%bind type_operator = idle_type_operator type_operator in
+      return @@ T_operator type_operator
+
+and idle_type_operator : I.type_operator -> O.type_operator result =
+  fun t_o ->
+  match t_o with
+    | TC_contract c -> 
+      let%bind c = idle_type_expression c in
+      ok @@ O.TC_contract c
+    | TC_option o ->
+      let%bind o = idle_type_expression o in
+      ok @@ O.TC_option o
+    | TC_list l ->
+      let%bind l = idle_type_expression l in
+      ok @@ O.TC_list l
+    | TC_set s ->
+      let%bind s = idle_type_expression s in
+      ok @@ O.TC_set s
+    | TC_map (k,v) ->
+      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      ok @@ O.TC_map (k,v)
+    | TC_big_map (k,v) ->
+      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      ok @@ O.TC_big_map (k,v)
+    | TC_arrow (i,o) ->
+      let%bind (i,o) = bind_map_pair idle_type_expression (i,o) in
+      ok @@ O.TC_arrow (i,o)
+
+let rec simplify_expression : I.expression -> O.expression result =
+  fun e ->
+  let return expr = ok @@ O.make_expr ~loc:e.location expr in
+  match e.expression_content with
+    | I.E_literal literal   -> return @@ O.E_literal literal
+    | I.E_constant {cons_name;arguments} -> 
+      let%bind arguments = bind_map_list simplify_expression arguments in
+      return @@ O.E_constant {cons_name;arguments}
+    | I.E_variable name     -> return @@ O.E_variable name
+    | I.E_application {expr1;expr2} -> 
+      let%bind expr1 = simplify_expression expr1 in
+      let%bind expr2 = simplify_expression expr2 in
+      return @@ O.E_application {expr1; expr2}
+    | I.E_lambda lambda ->
+      let%bind lambda = simplify_lambda lambda in
+      return @@ O.E_lambda lambda
+    | I.E_recursive {fun_name;fun_type;lambda} ->
+      let%bind fun_type = idle_type_expression fun_type in
+      let%bind lambda = simplify_lambda lambda in
+      return @@ O.E_recursive {fun_name;fun_type;lambda}
+    | I.E_let_in {let_binder;inline;rhs;let_result} ->
+      let (binder,ty_opt) = let_binder in
+      let%bind ty_opt = bind_map_option idle_type_expression ty_opt in
+      let%bind rhs = simplify_expression rhs in
+      let%bind let_result = simplify_expression let_result in
+      return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
+    | I.E_skip -> return @@ O.E_skip
+    | I.E_constructor {constructor;element} ->
+      let%bind element = simplify_expression element in
+      return @@ O.E_constructor {constructor;element}
+    | I.E_matching {matchee; cases} ->
+      let%bind matchee = simplify_expression matchee in
+      let%bind cases   = simplify_matching cases in
+      return @@ O.E_matching {matchee;cases}
+    | I.E_record record ->
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v =simplify_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ O.E_record (O.LMap.of_list record)
+    | I.E_record_accessor {expr;label} ->
+      let%bind expr = simplify_expression expr in
+      return @@ O.E_record_accessor {expr;label}
+    | I.E_record_update {record;path;update} ->
+      let%bind record = simplify_expression record in
+      let%bind update = simplify_expression update in
+      return @@ O.E_record_update {record;path;update}
+    | I.E_map map ->
+      let%bind map = bind_map_list (
+        bind_map_pair simplify_expression
+      ) map
+      in
+      return @@ O.E_map map
+    | I.E_big_map big_map ->
+      let%bind big_map = bind_map_list (
+        bind_map_pair simplify_expression
+      ) big_map
+      in
+      return @@ O.E_big_map big_map
+    | I.E_list lst ->
+      let%bind lst = bind_map_list simplify_expression lst in
+      return @@ O.E_list lst
+    | I.E_set set ->
+      let%bind set = bind_map_list simplify_expression set in
+      return @@ O.E_set set 
+    | I.E_look_up look_up ->
+      let%bind look_up = bind_map_pair simplify_expression look_up in
+      return @@ O.E_look_up look_up
+    | I.E_ascription {anno_expr; type_annotation} ->
+      let%bind anno_expr = simplify_expression anno_expr in
+      let%bind type_annotation = idle_type_expression type_annotation in
+      return @@ O.E_ascription {anno_expr; type_annotation}
+
+and simplify_lambda : I.lambda -> O.lambda result =
+  fun {binder;input_type;output_type;result}->
+    let%bind input_type = bind_map_option idle_type_expression input_type in
+    let%bind output_type = bind_map_option idle_type_expression output_type in
+    let%bind result = simplify_expression result in
+    ok @@ O.{binder;input_type;output_type;result}
+and simplify_matching : I.matching_expr -> O.matching_expr result =
+  fun m -> 
+  match m with 
+    | I.Match_bool {match_true;match_false} ->
+      let%bind match_true = simplify_expression match_true in
+      let%bind match_false = simplify_expression match_false in
+      ok @@ O.Match_bool {match_true;match_false}
+    | I.Match_list {match_nil;match_cons} ->
+      let%bind match_nil = simplify_expression match_nil in
+      let (hd,tl,expr,tv) = match_cons in
+      let%bind expr = simplify_expression expr in
+      ok @@ O.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
+    | I.Match_option {match_none;match_some} ->
+      let%bind match_none = simplify_expression match_none in
+      let (n,expr,tv) = match_some in
+      let%bind expr = simplify_expression expr in
+      ok @@ O.Match_option {match_none; match_some=(n,expr,tv)}
+    | I.Match_tuple ((lst,expr), tv) ->
+      let%bind expr = simplify_expression expr in
+      ok @@ O.Match_tuple ((lst,expr), tv)
+    | I.Match_variant (lst,tv) ->
+      let%bind lst = bind_map_list (
+        fun ((c,n),expr) ->
+          let%bind expr = simplify_expression expr in
+          ok @@ ((c,n),expr)
+      ) lst 
+      in
+      ok @@ O.Match_variant (lst,tv)
+ 
+let simplify_declaration : I.declaration Location.wrap -> _ =
+  fun {wrap_content=declaration;location} ->
+  let return decl = ok @@ Location.wrap ~loc:location decl in
+  match declaration with 
+  | I.Declaration_constant (n, te_opt, inline, expr) ->
+    let%bind expr = simplify_expression expr in
+    let%bind te_opt = bind_map_option idle_type_expression te_opt in
+    return @@ O.Declaration_constant (n, te_opt, inline, expr)
+  | I.Declaration_type (n, te) ->
+    let%bind te = idle_type_expression te in
+    return @@ O.Declaration_type (n,te)
+
+let simplify_program : I.program -> O.program result =
+  fun p ->
+  bind_map_list simplify_declaration p
diff --git a/src/passes/3-self_ast_simplified/dune b/src/passes/7-self_ast_simplified/dune
similarity index 100%
rename from src/passes/3-self_ast_simplified/dune
rename to src/passes/7-self_ast_simplified/dune
diff --git a/src/passes/4-typer-new/PP.ml b/src/passes/8-typer-new/PP.ml
similarity index 100%
rename from src/passes/4-typer-new/PP.ml
rename to src/passes/8-typer-new/PP.ml
diff --git a/src/passes/4-typer-new/dune b/src/passes/8-typer-new/dune
similarity index 100%
rename from src/passes/4-typer-new/dune
rename to src/passes/8-typer-new/dune
diff --git a/src/passes/4-typer-new/solver.ml b/src/passes/8-typer-new/solver.ml
similarity index 100%
rename from src/passes/4-typer-new/solver.ml
rename to src/passes/8-typer-new/solver.ml
diff --git a/src/passes/4-typer-new/typer.ml b/src/passes/8-typer-new/typer.ml
similarity index 99%
rename from src/passes/4-typer-new/typer.ml
rename to src/passes/8-typer-new/typer.ml
index decd197fc..a796d0ede 100644
--- a/src/passes/4-typer-new/typer.ml
+++ b/src/passes/8-typer-new/typer.ml
@@ -1094,7 +1094,7 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
     let%bind tv = untype_type_value rhs.type_expression in
     let%bind rhs = untype_expression rhs in
     let%bind result = untype_expression let_result in
-    return (e_let_in (let_binder , (Some tv)) false inline rhs result)
+    return (e_let_in (let_binder , (Some tv)) inline rhs result)
   | E_recursive {fun_name; fun_type; lambda} ->
       let%bind lambda = untype_lambda fun_type lambda in
       let%bind fun_type = untype_type_expression fun_type in
diff --git a/src/passes/4-typer-new/typer.ml.old b/src/passes/8-typer-new/typer.ml.old
similarity index 100%
rename from src/passes/4-typer-new/typer.ml.old
rename to src/passes/8-typer-new/typer.ml.old
diff --git a/src/passes/4-typer-new/typer.mli b/src/passes/8-typer-new/typer.mli
similarity index 100%
rename from src/passes/4-typer-new/typer.mli
rename to src/passes/8-typer-new/typer.mli
diff --git a/src/passes/4-typer-new/typer_new.ml b/src/passes/8-typer-new/typer_new.ml
similarity index 100%
rename from src/passes/4-typer-new/typer_new.ml
rename to src/passes/8-typer-new/typer_new.ml
diff --git a/src/passes/4-typer-old/dune b/src/passes/8-typer-old/dune
similarity index 100%
rename from src/passes/4-typer-old/dune
rename to src/passes/8-typer-old/dune
diff --git a/src/passes/4-typer-old/typer.ml b/src/passes/8-typer-old/typer.ml
similarity index 99%
rename from src/passes/4-typer-old/typer.ml
rename to src/passes/8-typer-old/typer.ml
index 448f7be08..e1cf018e2 100644
--- a/src/passes/4-typer-old/typer.ml
+++ b/src/passes/8-typer-old/typer.ml
@@ -893,7 +893,7 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       let%bind tv = untype_type_expression rhs.type_expression in
       let%bind rhs = untype_expression rhs in
       let%bind result = untype_expression let_result in
-      return (e_let_in (let_binder , (Some tv)) false inline rhs result)
+      return (e_let_in (let_binder , (Some tv)) inline rhs result)
   | E_recursive {fun_name;fun_type; lambda} ->
       let%bind fun_type = untype_type_expression fun_type in
       let%bind unty_expr= untype_expression_content ty @@ E_lambda lambda in
diff --git a/src/passes/4-typer-old/typer.mli b/src/passes/8-typer-old/typer.mli
similarity index 100%
rename from src/passes/4-typer-old/typer.mli
rename to src/passes/8-typer-old/typer.mli
diff --git a/src/passes/4-typer-old/typer_old.ml b/src/passes/8-typer-old/typer_old.ml
similarity index 100%
rename from src/passes/4-typer-old/typer_old.ml
rename to src/passes/8-typer-old/typer_old.ml
diff --git a/src/passes/4-typer/dune b/src/passes/8-typer/dune
similarity index 100%
rename from src/passes/4-typer/dune
rename to src/passes/8-typer/dune
diff --git a/src/passes/4-typer/typer.ml b/src/passes/8-typer/typer.ml
similarity index 100%
rename from src/passes/4-typer/typer.ml
rename to src/passes/8-typer/typer.ml
diff --git a/src/passes/4-typer/typer.mli b/src/passes/8-typer/typer.mli
similarity index 100%
rename from src/passes/4-typer/typer.mli
rename to src/passes/8-typer/typer.mli
diff --git a/src/passes/5-self_ast_typed/contract_passes.ml b/src/passes/9-self_ast_typed/contract_passes.ml
similarity index 100%
rename from src/passes/5-self_ast_typed/contract_passes.ml
rename to src/passes/9-self_ast_typed/contract_passes.ml
diff --git a/src/passes/5-self_ast_typed/dune b/src/passes/9-self_ast_typed/dune
similarity index 100%
rename from src/passes/5-self_ast_typed/dune
rename to src/passes/9-self_ast_typed/dune
diff --git a/src/passes/5-self_ast_typed/helpers.ml b/src/passes/9-self_ast_typed/helpers.ml
similarity index 100%
rename from src/passes/5-self_ast_typed/helpers.ml
rename to src/passes/9-self_ast_typed/helpers.ml
diff --git a/src/passes/5-self_ast_typed/self_ast_typed.ml b/src/passes/9-self_ast_typed/self_ast_typed.ml
similarity index 100%
rename from src/passes/5-self_ast_typed/self_ast_typed.ml
rename to src/passes/9-self_ast_typed/self_ast_typed.ml
diff --git a/src/passes/5-self_ast_typed/tail_recursion.ml b/src/passes/9-self_ast_typed/tail_recursion.ml
similarity index 100%
rename from src/passes/5-self_ast_typed/tail_recursion.ml
rename to src/passes/9-self_ast_typed/tail_recursion.ml
diff --git a/src/passes/9-self_michelson/main.ml b/src/passes/9-self_michelson/main.ml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/passes/operators/dune b/src/passes/operators/dune
index 64222a117..4eb539830 100644
--- a/src/passes/operators/dune
+++ b/src/passes/operators/dune
@@ -4,6 +4,9 @@
   (libraries
     simple-utils
     tezos-utils
+    ast_imperative
+    ast_complex
+    ast_simplified
     ast_typed
     typesystem
     mini_c
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index deb541216..abd16ae55 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -9,9 +9,9 @@ open Trace
   a new constructor at all those places.
 *)
 
-module Simplify = struct
+module Abstracter = struct
 
-  open Ast_simplified
+  open Ast_imperative
   (*
     Each front-end has its owns constants.
 
diff --git a/src/passes/operators/operators.mli b/src/passes/operators/operators.mli
index 77ce53196..1b33bb811 100644
--- a/src/passes/operators/operators.mli
+++ b/src/passes/operators/operators.mli
@@ -1,6 +1,6 @@
 
-module Simplify : sig
- open Ast_simplified
+module Abstracter : sig
+ open Ast_imperative
  open Trace
 
   module Pascaligo : sig
diff --git a/src/stages/ast_simplified/PP.ml b/src/stages/1-ast_imperative/PP.ml
similarity index 99%
rename from src/stages/ast_simplified/PP.ml
rename to src/stages/1-ast_imperative/PP.ml
index f27d9ed70..576575d69 100644
--- a/src/stages/ast_simplified/PP.ml
+++ b/src/stages/1-ast_imperative/PP.ml
@@ -4,7 +4,7 @@ open Format
 open PP_helpers
 
 include Stage_common.PP
-include Ast_PP_type(Ast_simplified_parameter)
+include Ast_PP_type(Ast_imperative_parameter)
 
 let expression_variable ppf (ev : expression_variable) : unit =
   fprintf ppf "%a" Var.pp ev
@@ -52,13 +52,13 @@ and expression_content ppf (ec : expression_content) =
       fprintf ppf "match %a with %a"
         expression matchee (matching expression)
         cases
-  | E_let_in { let_binder ; mut; rhs ; let_result; inline } ->    
-      fprintf ppf "let %a%a = %a%a in %a" option_mut mut option_type_name let_binder expression rhs option_inline inline expression let_result
   | E_recursive { fun_name; fun_type; lambda} ->
       fprintf ppf "rec (%a:%a => %a )" 
         expression_variable fun_name 
         type_expression fun_type
         expression_content (E_lambda lambda)
+  | E_let_in { let_binder ; mut; rhs ; let_result; inline } ->    
+      fprintf ppf "let %a%a = %a%a in %a" option_mut mut option_type_name let_binder expression rhs option_inline inline expression let_result
   | E_skip ->
       fprintf ppf "skip"
   | E_ascription {anno_expr; type_annotation} ->
diff --git a/src/stages/ast_simplified/ast_simplified.ml b/src/stages/1-ast_imperative/ast_imperative.ml
similarity index 100%
rename from src/stages/ast_simplified/ast_simplified.ml
rename to src/stages/1-ast_imperative/ast_imperative.ml
diff --git a/src/stages/ast_simplified/combinators.ml b/src/stages/1-ast_imperative/combinators.ml
similarity index 71%
rename from src/stages/ast_simplified/combinators.ml
rename to src/stages/1-ast_imperative/combinators.ml
index 24b292c4f..a37a1b7ef 100644
--- a/src/stages/ast_simplified/combinators.ml
+++ b/src/stages/1-ast_imperative/combinators.ml
@@ -79,56 +79,56 @@ let t_operator op lst: type_expression result =
   | TC_contract _    , [t] -> ok @@ t_contract t
   | _ , _ -> fail @@ bad_type_operator op
 
-let location_wrap ?(loc = Location.generated) expression_content =
+let make_expr ?(loc = Location.generated) expression_content =
   let location = loc in
   { expression_content; location }
 
-let e_var ?loc (n: string) : expression = location_wrap ?loc @@ E_variable (Var.of_name n)
-let e_literal ?loc l : expression = location_wrap ?loc @@ E_literal l
-let e_unit ?loc () : expression = location_wrap ?loc @@ E_literal (Literal_unit)
-let e_int ?loc n : expression = location_wrap ?loc @@ E_literal (Literal_int n)
-let e_nat ?loc n : expression = location_wrap ?loc @@ E_literal (Literal_nat n)
-let e_timestamp ?loc n : expression = location_wrap ?loc @@ E_literal (Literal_timestamp n)
-let e_bool ?loc   b : expression = location_wrap ?loc @@ E_literal (Literal_bool b)
-let e_string ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_string s)
-let e_address ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_address s)
-let e_mutez ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_mutez s)
-let e_signature ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_signature s)
-let e_key ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_key s)
-let e_key_hash ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_key_hash s)
-let e_chain_id ?loc s : expression = location_wrap ?loc @@ E_literal (Literal_chain_id s)
+let e_var ?loc (n: string) : expression = make_expr ?loc @@ E_variable (Var.of_name n)
+let e_literal ?loc l : expression = make_expr ?loc @@ E_literal l
+let e_unit ?loc () : expression = make_expr ?loc @@ E_literal (Literal_unit)
+let e_int ?loc n : expression = make_expr ?loc @@ E_literal (Literal_int n)
+let e_nat ?loc n : expression = make_expr ?loc @@ E_literal (Literal_nat n)
+let e_timestamp ?loc n : expression = make_expr ?loc @@ E_literal (Literal_timestamp n)
+let e_bool ?loc   b : expression = make_expr ?loc @@ E_literal (Literal_bool b)
+let e_string ?loc s : expression = make_expr ?loc @@ E_literal (Literal_string s)
+let e_address ?loc s : expression = make_expr ?loc @@ E_literal (Literal_address s)
+let e_mutez ?loc s : expression = make_expr ?loc @@ E_literal (Literal_mutez s)
+let e_signature ?loc s : expression = make_expr ?loc @@ E_literal (Literal_signature s)
+let e_key ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key s)
+let e_key_hash ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key_hash s)
+let e_chain_id ?loc s : expression = make_expr ?loc @@ E_literal (Literal_chain_id s)
 let e'_bytes b : expression_content result =
   let%bind bytes = generic_try (simple_error "bad hex to bytes") (fun () -> Hex.to_bytes (`Hex b)) in
   ok @@ E_literal (Literal_bytes bytes)
 let e_bytes_hex ?loc b : expression result =
   let%bind e' = e'_bytes b in
-  ok @@ location_wrap ?loc e'
+  ok @@ make_expr ?loc e'
 let e_bytes_raw ?loc (b: bytes) : expression =
-  location_wrap ?loc @@ E_literal (Literal_bytes b)
+  make_expr ?loc @@ E_literal (Literal_bytes b)
 let e_bytes_string ?loc (s: string) : expression =
-  location_wrap ?loc @@ E_literal (Literal_bytes (Hex.to_bytes (Hex.of_string s)))
-let e_big_map ?loc lst : expression = location_wrap ?loc @@ E_big_map lst
-let e_some ?loc s  : expression = location_wrap ?loc @@ E_constant {cons_name = C_SOME; arguments = [s]}
-let e_none ?loc () : expression = location_wrap ?loc @@ E_constant {cons_name = C_NONE; arguments = []}
-let e_string_cat ?loc sl sr : expression = location_wrap ?loc @@ E_constant {cons_name = C_CONCAT; arguments = [sl ; sr ]}
-let e_map_add ?loc k v old  : expression = location_wrap ?loc @@ E_constant {cons_name = C_MAP_ADD; arguments = [k ; v ; old]}
-let e_map ?loc lst : expression = location_wrap ?loc @@ E_map lst
-let e_set ?loc lst : expression = location_wrap ?loc @@ E_set lst
-let e_list ?loc lst : expression = location_wrap ?loc @@ E_list lst
-let e_constructor ?loc s a : expression = location_wrap ?loc @@ E_constructor { constructor = Constructor s; element = a}
-let e_matching ?loc a b : expression = location_wrap ?loc @@ E_matching {matchee=a;cases=b}
+  make_expr ?loc @@ E_literal (Literal_bytes (Hex.to_bytes (Hex.of_string s)))
+let e_big_map ?loc lst : expression = make_expr ?loc @@ E_big_map lst
+let e_some ?loc s  : expression = make_expr ?loc @@ E_constant {cons_name = C_SOME; arguments = [s]}
+let e_none ?loc () : expression = make_expr ?loc @@ E_constant {cons_name = C_NONE; arguments = []}
+let e_string_cat ?loc sl sr : expression = make_expr ?loc @@ E_constant {cons_name = C_CONCAT; arguments = [sl ; sr ]}
+let e_map_add ?loc k v old  : expression = make_expr ?loc @@ E_constant {cons_name = C_MAP_ADD; arguments = [k ; v ; old]}
+let e_map ?loc lst : expression = make_expr ?loc @@ E_map lst
+let e_set ?loc lst : expression = make_expr ?loc @@ E_set lst
+let e_list ?loc lst : expression = make_expr ?loc @@ E_list lst
+let e_constructor ?loc s a : expression = make_expr ?loc @@ E_constructor { constructor = Constructor s; element = a}
+let e_matching ?loc a b : expression = make_expr ?loc @@ E_matching {matchee=a;cases=b}
 let e_matching_bool ?loc a b c : expression = e_matching ?loc a (Match_bool {match_true = b ; match_false = c})
-let e_accessor ?loc a b = location_wrap ?loc @@ E_record_accessor {expr = a; label= Label b}
+let e_accessor ?loc a b = make_expr ?loc @@ E_record_accessor {expr = a; label= Label b}
 let e_accessor_list ?loc a b  = List.fold_left (fun a b -> e_accessor ?loc a b) a b
-let e_variable ?loc v = location_wrap ?loc @@ E_variable v
-let e_skip ?loc () = location_wrap ?loc @@ E_skip
+let e_variable ?loc v = make_expr ?loc @@ E_variable v
+let e_skip ?loc () = make_expr ?loc @@ E_skip
 let e_let_in ?loc (binder, ascr) mut inline rhs let_result = 
-  location_wrap ?loc @@ E_let_in { let_binder = (binder, ascr) ; mut; rhs ; let_result; inline }
-let e_annotation ?loc anno_expr ty = location_wrap ?loc @@ E_ascription {anno_expr; type_annotation = ty}
-let e_application ?loc a b = location_wrap ?loc @@ E_application {expr1=a ; expr2=b}
-let e_binop ?loc name a b  = location_wrap ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
-let e_constant ?loc name lst = location_wrap ?loc @@ E_constant {cons_name=name ; arguments = lst}
-let e_look_up ?loc x y = location_wrap ?loc @@ E_look_up (x , y)
+  make_expr ?loc @@ E_let_in { let_binder = (binder, ascr) ; mut; rhs ; let_result; inline }
+let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
+let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
+let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
+let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
 let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false false expr1 expr2
 let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
 (*
@@ -141,14 +141,14 @@ let e_matching_variant ?loc a (lst : ((string * string)* 'a) list) =
   e_matching ?loc a (ez_match_variant lst)
 let e_record_ez ?loc (lst : (string * expr) list) : expression =
   let map = List.fold_left (fun m (x, y) -> LMap.add (Label x) y m) LMap.empty lst in
-  location_wrap ?loc @@ E_record map
+  make_expr ?loc @@ E_record map
 let e_record ?loc map =
   let lst = Map.String.to_kv_list map in
   e_record_ez ?loc lst 
 
 let e_update ?loc record path update = 
   let path = Label path in
-  location_wrap ?loc @@ E_record_update {record; path; update}
+  make_expr ?loc @@ E_record_update {record; path; update}
 
 let e_tuple ?loc lst : expression = e_record_ez ?loc (tuple_to_record lst)
 let e_pair ?loc a b  : expression = e_tuple ?loc [a;b]
@@ -177,13 +177,13 @@ let e_lambda ?loc (binder : expression_variable)
     (output_type : type_expression option)
     (result : expression)
   : expression =
-  location_wrap ?loc @@ E_lambda {
-    binder = binder;
+  make_expr ?loc @@ E_lambda {
+    binder = binder ;
     input_type = input_type ;
     output_type = output_type ;
     result ;
   }
-let e_recursive ?loc fun_name fun_type lambda = location_wrap ?loc @@ E_recursive {fun_name; fun_type; lambda}
+let e_recursive ?loc fun_name fun_type lambda = make_expr ?loc @@ E_recursive {fun_name; fun_type; lambda}
 
 
 let e_assign_with_let ?loc var access_path expr = 
diff --git a/src/stages/ast_simplified/combinators.mli b/src/stages/1-ast_imperative/combinators.mli
similarity index 98%
rename from src/stages/ast_simplified/combinators.mli
rename to src/stages/1-ast_imperative/combinators.mli
index 5dc0af74c..ca2f2d552 100644
--- a/src/stages/ast_simplified/combinators.mli
+++ b/src/stages/1-ast_imperative/combinators.mli
@@ -46,6 +46,7 @@ val t_map : type_expression -> type_expression -> type_expression
 val t_operator : type_operator -> type_expression list -> type_expression result
 val t_set : type_expression -> type_expression
 
+val make_expr : ?loc:Location.t -> expression_content -> expression
 val e_var : ?loc:Location.t -> string -> expression
 val e_literal : ?loc:Location.t -> literal -> expression
 val e_unit : ?loc:Location.t -> unit -> expression
diff --git a/src/stages/1-ast_imperative/dune b/src/stages/1-ast_imperative/dune
new file mode 100644
index 000000000..8966ca542
--- /dev/null
+++ b/src/stages/1-ast_imperative/dune
@@ -0,0 +1,13 @@
+(library
+  (name ast_imperative)
+  (public_name ligo.ast_impretative)
+  (libraries
+    simple-utils
+    tezos-utils
+    stage_common
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -open Simple_utils ))
+)
diff --git a/src/stages/ast_simplified/misc.ml b/src/stages/1-ast_imperative/misc.ml
similarity index 100%
rename from src/stages/ast_simplified/misc.ml
rename to src/stages/1-ast_imperative/misc.ml
diff --git a/src/stages/ast_simplified/misc.mli b/src/stages/1-ast_imperative/misc.mli
similarity index 100%
rename from src/stages/ast_simplified/misc.mli
rename to src/stages/1-ast_imperative/misc.mli
diff --git a/src/stages/1-ast_imperative/types.ml b/src/stages/1-ast_imperative/types.ml
new file mode 100644
index 000000000..75d17207f
--- /dev/null
+++ b/src/stages/1-ast_imperative/types.ml
@@ -0,0 +1,118 @@
+[@@@warning "-30"]
+
+module Location = Simple_utils.Location
+
+module Ast_imperative_parameter = struct
+  type type_meta = unit
+end
+
+include Stage_common.Types
+
+(*include Ast_generic_type(Ast_simplified_parameter)
+*)
+include Ast_generic_type (Ast_imperative_parameter)
+
+type inline = bool 
+type program = declaration Location.wrap list
+and declaration =
+  | Declaration_type of (type_variable * type_expression)
+
+  (* A Declaration_constant is described by
+   *   a name
+   *   an optional type annotation
+   *   a boolean indicating whether it should be inlined
+   *   an expression *)
+  | Declaration_constant of (expression_variable * type_expression option * inline * expression)
+
+(* | Macro_declaration of macro_declaration *)
+and expression = {expression_content: expression_content; location: Location.t}
+
+and expression_content =
+  (* Base *)
+  | E_literal of literal
+  | E_constant of constant (* For language constants, like (Cons hd tl) or (plus i j) *)
+  | E_variable of expression_variable
+  | E_application of application
+  | E_lambda of lambda
+  | E_recursive of recursive
+  | E_let_in of let_in
+  | E_skip
+  (* Variant *)
+  | E_constructor of constructor (* For user defined constructors *)
+  | E_matching of matching
+  (* Record *)
+  | E_record of expression label_map
+  | E_record_accessor of accessor
+  | E_record_update of update
+  (* Data Structures *)
+  (* TODO : move to constant*)
+  | E_map of (expression * expression) list (*move to operator *)
+  | E_big_map of (expression * expression) list (*move to operator *)
+  | E_list of expression list
+  | E_set of expression list
+  | E_look_up of (expression * expression)
+  (* Advanced *)
+  | E_ascription of ascription
+
+and constant =
+  { cons_name: constant' (* this is at the end because it is huge *)
+  ; arguments: expression list }
+
+and application = {expr1: expression; expr2: expression}
+
+and lambda =
+  { binder: expression_variable
+  ; input_type: type_expression option
+  ; output_type: type_expression option
+  ; result: expression }
+
+and recursive = {
+  fun_name :  expression_variable;
+  fun_type : type_expression;
+  lambda : lambda;
+}
+
+and let_in =
+  { let_binder: expression_variable * type_expression option
+  ; mut: bool
+  ; rhs: expression
+  ; let_result: expression
+  ; inline: bool }
+
+and constructor = {constructor: constructor'; element: expression}
+
+and accessor = {expr: expression; label: label}
+
+and update = {record: expression; path: label ; update: expression}
+
+and matching_expr = (expr,unit) matching_content
+and matching =
+  { matchee: expression
+  ; cases: matching_expr
+  }
+
+and ascription = {anno_expr: expression; type_annotation: type_expression}
+
+and environment_element_definition =
+  | ED_binder
+  | ED_declaration of (expression * free_variables)
+
+and free_variables = expression_variable list
+
+and environment_element =
+  { type_value: type_expression
+  ; source_environment: full_environment
+  ; definition: environment_element_definition }
+
+and environment = (expression_variable * environment_element) list
+
+and type_environment = (type_variable * type_expression) list
+
+(* SUBST ??? *)
+and small_environment = environment * type_environment
+
+and full_environment = small_environment List.Ne.t
+
+and expr = expression
+
+and texpr = type_expression
diff --git a/src/stages/2-ast_complex/PP.ml b/src/stages/2-ast_complex/PP.ml
new file mode 100644
index 000000000..d6e949751
--- /dev/null
+++ b/src/stages/2-ast_complex/PP.ml
@@ -0,0 +1,138 @@
+[@@@coverage exclude_file]
+open Types
+open Format
+open PP_helpers
+
+include Stage_common.PP
+include Ast_PP_type(Ast_complex_parameter)
+
+let expression_variable ppf (ev : expression_variable) : unit =
+  fprintf ppf "%a" Var.pp ev
+
+
+let rec expression ppf (e : expression) =
+  expression_content ppf e.expression_content
+and expression_content ppf (ec : expression_content) =
+  match ec with
+  | E_literal l ->
+      literal ppf l
+  | E_variable n ->
+      fprintf ppf "%a" expression_variable n
+  | E_application app ->
+      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_constructor c ->
+      fprintf ppf "%a(%a)" constructor c.constructor expression c.element
+  | E_constant c ->
+      fprintf ppf "%a(%a)" constant c.cons_name (list_sep_d expression)
+        c.arguments
+  | E_record m ->
+      fprintf ppf "%a" (tuple_or_record_sep_expr expression) m
+  | E_record_accessor ra ->
+      fprintf ppf "%a.%a" expression ra.expr label ra.label
+  | E_record_update {record; path; update} ->
+      fprintf ppf "{ %a with { %a = %a } }" expression record label path expression update
+  | E_map m ->
+      fprintf ppf "map[%a]" (list_sep_d assoc_expression) m
+  | E_big_map m ->
+      fprintf ppf "big_map[%a]" (list_sep_d assoc_expression) m
+  | E_list lst ->
+      fprintf ppf "list[%a]" (list_sep_d expression) lst
+  | E_set lst ->
+      fprintf ppf "set[%a]" (list_sep_d expression) lst
+  | E_look_up (ds, ind) ->
+      fprintf ppf "(%a)[%a]" expression ds expression ind
+  | E_lambda {binder; input_type; output_type; result} ->
+      fprintf ppf "lambda (%a:%a) : %a return %a" 
+        expression_variable binder
+        (PP_helpers.option type_expression)
+        input_type
+        (PP_helpers.option type_expression)
+        output_type expression result
+  | E_recursive { fun_name; fun_type; lambda} ->
+      fprintf ppf "rec (%a:%a => %a )" 
+        expression_variable fun_name 
+        type_expression fun_type
+        expression_content (E_lambda lambda)
+  | E_matching {matchee; cases; _} ->
+      fprintf ppf "match %a with %a" expression matchee (matching expression)
+        cases
+  | E_let_in { let_binder ; rhs ; let_result; inline } ->    
+    fprintf ppf "let %a = %a%a in %a" option_type_name let_binder expression rhs option_inline inline expression let_result
+  | E_skip ->
+      fprintf ppf "skip"
+  | E_ascription {anno_expr; type_annotation} ->
+      fprintf ppf "%a : %a" expression anno_expr type_expression
+        type_annotation
+
+and option_type_name ppf
+    ((n, ty_opt) : expression_variable * type_expression option) =
+  match ty_opt with
+  | None ->
+      fprintf ppf "%a" expression_variable n
+  | Some ty ->
+      fprintf ppf "%a : %a" expression_variable n type_expression ty
+
+and assoc_expression ppf : expr * expr -> unit =
+ fun (a, b) -> fprintf ppf "%a -> %a" expression a expression b
+
+and single_record_patch ppf ((p, expr) : label * expr) =
+  fprintf ppf "%a <- %a" label p expression expr
+
+and matching_variant_case : type a . (_ -> a -> unit) -> _ -> (constructor' * expression_variable) * a -> unit =
+  fun f ppf ((c,n),a) ->
+  fprintf ppf "| %a %a -> %a" constructor c expression_variable n f a
+
+and matching : type a . (formatter -> a -> unit) -> formatter -> (a,unit) matching_content -> unit =
+  fun f ppf m -> match m with
+    | Match_tuple ((lst, b), _) ->
+        fprintf ppf "let (%a) = %a" (list_sep_d expression_variable) lst f b
+    | Match_variant (lst, _) ->
+        fprintf ppf "%a" (list_sep (matching_variant_case f) (tag "@.")) lst
+    | Match_bool {match_true ; match_false} ->
+        fprintf ppf "| True -> %a @.| False -> %a" f match_true f match_false
+    | Match_list {match_nil ; match_cons = (hd, tl, match_cons, _)} ->
+        fprintf ppf "| Nil -> %a @.| %a :: %a -> %a" f match_nil expression_variable hd expression_variable tl f match_cons
+    | Match_option {match_none ; match_some = (some, match_some, _)} ->
+        fprintf ppf "| None -> %a @.| Some %a -> %a" f match_none expression_variable some f match_some
+
+(* Shows the type expected for the matched value *)
+and matching_type ppf m = match m with
+  | Match_tuple _ ->
+      fprintf ppf "tuple"
+  | Match_variant (lst, _) ->
+      fprintf ppf "variant %a" (list_sep matching_variant_case_type (tag "@.")) lst
+  | Match_bool _ ->
+      fprintf ppf "boolean"
+  | Match_list _ ->
+      fprintf ppf "list"
+  | Match_option _ ->
+      fprintf ppf "option"
+
+and matching_variant_case_type ppf ((c,n),_a) =
+  fprintf ppf "| %a %a" constructor c expression_variable n
+
+and option_mut ppf mut = 
+  if mut then 
+    fprintf ppf "[@mut]"
+  else
+    fprintf ppf ""
+
+and option_inline ppf inline = 
+  if inline then 
+    fprintf ppf "[@inline]"
+  else
+    fprintf ppf ""
+
+let declaration ppf (d : declaration) =
+  match d with
+  | Declaration_type (type_name, te) ->
+      fprintf ppf "type %a = %a" type_variable type_name type_expression te
+  | Declaration_constant (name, ty_opt, i, expr) ->
+      fprintf ppf "const %a = %a%a" option_type_name (name, ty_opt) expression
+        expr
+        option_inline i
+
+let program ppf (p : program) =
+  fprintf ppf "@[<v>%a@]"
+    (list_sep declaration (tag "@;"))
+    (List.map Location.unwrap p)
diff --git a/src/stages/2-ast_complex/ast_complex.ml b/src/stages/2-ast_complex/ast_complex.ml
new file mode 100644
index 000000000..e9614490a
--- /dev/null
+++ b/src/stages/2-ast_complex/ast_complex.ml
@@ -0,0 +1,8 @@
+include Types
+
+(* include Misc *)
+include Combinators
+module Types = Types
+module Misc = Misc
+module PP=PP
+module Combinators = Combinators
diff --git a/src/stages/2-ast_complex/combinators.ml b/src/stages/2-ast_complex/combinators.ml
new file mode 100644
index 000000000..9ac673a3c
--- /dev/null
+++ b/src/stages/2-ast_complex/combinators.ml
@@ -0,0 +1,268 @@
+open Types
+open Simple_utils.Trace
+module Option = Simple_utils.Option
+
+module SMap = Map.String
+
+module Errors = struct
+  let bad_kind expected location =
+    let title () = Format.asprintf "a %s was expected" expected in
+    let message () = "" in
+    let data = [
+      ("location" , fun () -> Format.asprintf "%a" Location.pp location) ;
+    ] in
+    error ~data title message
+  let bad_type_operator type_op =
+    let title () = Format.asprintf "bad type operator %a" (PP.type_operator PP.type_expression) type_op in
+    let message () = "" in
+    error title message
+end
+open Errors
+
+let make_t type_content = {type_content; type_meta = ()}
+
+  
+let tuple_to_record lst =
+  let aux (i,acc) el = (i+1,(string_of_int i, el)::acc) in
+  let (_, lst ) = List.fold_left aux (0,[]) lst in
+  lst
+
+let t_bool         : type_expression = make_t @@ T_constant (TC_bool)
+let t_string       : type_expression = make_t @@ T_constant (TC_string)
+let t_bytes        : type_expression = make_t @@ T_constant (TC_bytes)
+let t_int          : type_expression = make_t @@ T_constant (TC_int)
+let t_operation    : type_expression = make_t @@ T_constant (TC_operation)
+let t_nat          : type_expression = make_t @@ T_constant (TC_nat)
+let t_tez          : type_expression = make_t @@ T_constant (TC_mutez)
+let t_unit         : type_expression = make_t @@ T_constant (TC_unit)
+let t_address      : type_expression = make_t @@ T_constant (TC_address)
+let t_signature    : type_expression = make_t @@ T_constant (TC_signature)
+let t_key          : type_expression = make_t @@ T_constant (TC_key)
+let t_key_hash     : type_expression = make_t @@ T_constant (TC_key_hash)
+let t_timestamp    : type_expression = make_t @@ T_constant (TC_timestamp)
+let t_option  o    : type_expression = make_t @@ T_operator (TC_option o)
+let t_list  t      : type_expression = make_t @@ T_operator (TC_list t)
+let t_variable n   : type_expression = make_t @@ T_variable (Var.of_name n)
+let t_record_ez lst =
+  let lst = List.map (fun (k, v) -> (Label k, v)) lst in
+  let m = LMap.of_list lst in
+  make_t @@ T_record m
+let t_record m  : type_expression =
+  let lst = Map.String.to_kv_list m in
+  t_record_ez lst
+
+let t_pair (a , b) : type_expression = t_record_ez [("0",a) ; ("1",b)]
+let t_tuple lst    : type_expression = t_record_ez (tuple_to_record lst)
+
+let ez_t_sum (lst:(string * type_expression) list) : type_expression =
+  let aux prev (k, v) = CMap.add (Constructor k) v prev in
+  let map = List.fold_left aux CMap.empty lst in
+  make_t @@ T_sum map
+let t_sum m : type_expression =
+  let lst = Map.String.to_kv_list m in
+  ez_t_sum lst
+
+let t_function type1 type2  : type_expression = make_t @@ T_arrow {type1; type2}
+let t_map key value         : type_expression = make_t @@ T_operator (TC_map (key, value))
+let t_big_map key value     : type_expression = make_t @@ T_operator (TC_big_map (key , value))
+let t_set key               : type_expression = make_t @@ T_operator (TC_set key)
+let t_contract contract     : type_expression = make_t @@ T_operator (TC_contract contract)
+
+(* TODO find a better way than using list*)
+let t_operator op lst: type_expression result =
+  match op,lst with 
+  | TC_set _         , [t] -> ok @@ t_set t
+  | TC_list _        , [t] -> ok @@ t_list t
+  | TC_option _      , [t] -> ok @@ t_option t
+  | TC_map (_,_)     , [kt;vt] -> ok @@ t_map kt vt
+  | TC_big_map (_,_) , [kt;vt] -> ok @@ t_big_map kt vt
+  | TC_contract _    , [t] -> ok @@ t_contract t
+  | _ , _ -> fail @@ bad_type_operator op
+
+let make_expr ?(loc = Location.generated) expression_content =
+  let location = loc in
+  { expression_content; location }
+
+let e_var ?loc (n: string) : expression = make_expr ?loc @@ E_variable (Var.of_name n)
+let e_literal ?loc l : expression = make_expr ?loc @@ E_literal l
+let e_unit ?loc () : expression = make_expr ?loc @@ E_literal (Literal_unit)
+let e_int ?loc n : expression = make_expr ?loc @@ E_literal (Literal_int n)
+let e_nat ?loc n : expression = make_expr ?loc @@ E_literal (Literal_nat n)
+let e_timestamp ?loc n : expression = make_expr ?loc @@ E_literal (Literal_timestamp n)
+let e_bool ?loc   b : expression = make_expr ?loc @@ E_literal (Literal_bool b)
+let e_string ?loc s : expression = make_expr ?loc @@ E_literal (Literal_string s)
+let e_address ?loc s : expression = make_expr ?loc @@ E_literal (Literal_address s)
+let e_mutez ?loc s : expression = make_expr ?loc @@ E_literal (Literal_mutez s)
+let e_signature ?loc s : expression = make_expr ?loc @@ E_literal (Literal_signature s)
+let e_key ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key s)
+let e_key_hash ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key_hash s)
+let e_chain_id ?loc s : expression = make_expr ?loc @@ E_literal (Literal_chain_id s)
+let e'_bytes b : expression_content result =
+  let%bind bytes = generic_try (simple_error "bad hex to bytes") (fun () -> Hex.to_bytes (`Hex b)) in
+  ok @@ E_literal (Literal_bytes bytes)
+let e_bytes_hex ?loc b : expression result =
+  let%bind e' = e'_bytes b in
+  ok @@ make_expr ?loc e'
+let e_bytes_raw ?loc (b: bytes) : expression =
+  make_expr ?loc @@ E_literal (Literal_bytes b)
+let e_bytes_string ?loc (s: string) : expression =
+  make_expr ?loc @@ E_literal (Literal_bytes (Hex.to_bytes (Hex.of_string s)))
+let e_big_map ?loc lst : expression = make_expr ?loc @@ E_big_map lst
+let e_some ?loc s  : expression = make_expr ?loc @@ E_constant {cons_name = C_SOME; arguments = [s]}
+let e_none ?loc () : expression = make_expr ?loc @@ E_constant {cons_name = C_NONE; arguments = []}
+let e_string_cat ?loc sl sr : expression = make_expr ?loc @@ E_constant {cons_name = C_CONCAT; arguments = [sl ; sr ]}
+let e_map_add ?loc k v old  : expression = make_expr ?loc @@ E_constant {cons_name = C_MAP_ADD; arguments = [k ; v ; old]}
+let e_map ?loc lst : expression = make_expr ?loc @@ E_map lst
+let e_set ?loc lst : expression = make_expr ?loc @@ E_set lst
+let e_list ?loc lst : expression = make_expr ?loc @@ E_list lst
+let e_constructor ?loc s a : expression = make_expr ?loc @@ E_constructor { constructor = Constructor s; element = a}
+let e_matching ?loc a b : expression = make_expr ?loc @@ E_matching {matchee=a;cases=b}
+let e_matching_bool ?loc a b c : expression = e_matching ?loc a (Match_bool {match_true = b ; match_false = c})
+let e_accessor ?loc a b = make_expr ?loc @@ E_record_accessor {expr = a; label= Label b}
+let e_accessor_list ?loc a b  = List.fold_left (fun a b -> e_accessor ?loc a b) a b
+let e_variable ?loc v = make_expr ?loc @@ E_variable v
+let e_skip ?loc () = make_expr ?loc @@ E_skip
+let e_let_in ?loc (binder, ascr) inline rhs let_result = 
+  make_expr ?loc @@ E_let_in { let_binder = (binder, ascr) ; rhs ; let_result; inline }
+let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
+let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
+let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
+let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
+let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false expr1 expr2
+let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
+(*
+let e_assign ?loc a b c = location_wrap ?loc @@ E_assign (Var.of_name a , b , c) (* TODO handlethat*)
+*)
+let ez_match_variant (lst : ((string * string) * 'a) list) =
+  let lst = List.map (fun ((c,n),a) -> ((Constructor c, Var.of_name n), a) ) lst in
+  Match_variant (lst,())
+let e_matching_variant ?loc a (lst : ((string * string)* 'a) list) =
+  e_matching ?loc a (ez_match_variant lst)
+let e_record_ez ?loc (lst : (string * expr) list) : expression =
+  let map = List.fold_left (fun m (x, y) -> LMap.add (Label x) y m) LMap.empty lst in
+  make_expr ?loc @@ E_record map
+let e_record ?loc map =
+  let lst = Map.String.to_kv_list map in
+  e_record_ez ?loc lst 
+
+let e_update ?loc record path update = 
+  let path = Label path in
+  make_expr ?loc @@ E_record_update {record; path; update}
+
+let e_tuple ?loc lst : expression = e_record_ez ?loc (tuple_to_record lst)
+let e_pair ?loc a b  : expression = e_tuple ?loc [a;b]
+
+let make_option_typed ?loc e t_opt =
+  match t_opt with
+  | None -> e
+  | Some t -> e_annotation ?loc e t
+
+
+let e_typed_none ?loc t_opt =
+  let type_annotation = t_option t_opt in
+  e_annotation ?loc (e_none ?loc ()) type_annotation
+
+let e_typed_list ?loc lst t =
+  e_annotation ?loc (e_list lst) (t_list t)
+
+let e_typed_map ?loc lst k v = e_annotation ?loc (e_map lst) (t_map k v)
+let e_typed_big_map ?loc lst k v = e_annotation ?loc (e_big_map lst) (t_big_map k v)
+
+let e_typed_set ?loc lst k = e_annotation ?loc (e_set lst) (t_set k)
+
+
+let e_lambda ?loc (binder : expression_variable)
+    (input_type : type_expression option)
+    (output_type : type_expression option)
+    (result : expression)
+  : expression =
+  make_expr ?loc @@ E_lambda {
+    binder = binder ;
+    input_type = input_type ;
+    output_type = output_type ;
+    result ;
+  }
+let e_recursive ?loc fun_name fun_type lambda = make_expr ?loc @@ E_recursive {fun_name; fun_type; lambda}
+
+
+let e_assign_with_let ?loc var access_path expr = 
+  let var = Var.of_name (var) in
+  match access_path with 
+  | [] -> (var, None), true, expr, false
+
+  | lst -> 
+    let rec aux path record= match path with 
+    | [] -> failwith "acces_path cannot be empty"
+    | [e] -> e_update ?loc record e expr
+    | elem::tail -> 
+      let next_record = e_accessor record elem in
+      e_update ?loc record elem (aux tail next_record )
+    in 
+    (var, None), true, (aux lst (e_variable var)), false
+
+let get_e_accessor = fun t ->
+  match t with
+  | E_record_accessor {expr; label} -> ok (expr , label)
+  | _ -> simple_fail "not an accessor"
+
+let assert_e_accessor = fun t ->
+  let%bind _ = get_e_accessor t in
+  ok ()
+
+let get_e_pair = fun t ->
+  match t with
+  | E_record r -> ( 
+  let lst = LMap.to_kv_list r in
+    match lst with 
+    | [(Label "O",a);(Label "1",b)]
+    | [(Label "1",b);(Label "0",a)] -> 
+        ok (a , b)
+    | _ -> simple_fail "not a pair"
+    )
+  | _ -> simple_fail "not a pair"
+
+let get_e_list = fun t ->
+  match t with
+  | E_list lst -> ok lst
+  | _ -> simple_fail "not a list"
+
+let tuple_of_record (m: _ LMap.t) =
+  let aux i = 
+    let opt = LMap.find_opt (Label (string_of_int i)) m in
+    Option.bind (fun opt -> Some (opt,i+1)) opt
+  in
+  Base.Sequence.to_list @@ Base.Sequence.unfold ~init:0 ~f:aux
+
+let get_e_tuple = fun t ->
+  match t with
+  | E_record r -> ok @@ tuple_of_record r
+  | _ -> simple_fail "ast_simplified: get_e_tuple: not a tuple"
+
+(* Same as get_e_pair *)
+let extract_pair : expression -> (expression * expression) result = fun e ->
+  match e.expression_content with
+  | E_record r -> ( 
+  let lst = LMap.to_kv_list r in
+    match lst with 
+    | [(Label "O",a);(Label "1",b)]
+    | [(Label "1",b);(Label "0",a)] -> 
+        ok (a , b)
+    | _ -> fail @@ bad_kind "pair" e.location
+    )
+  | _ -> fail @@ bad_kind "pair" e.location
+
+let extract_list : expression -> (expression list) result = fun e ->
+  match e.expression_content with
+  | E_list lst -> ok lst
+  | _ -> fail @@ bad_kind "list" e.location
+
+let extract_record : expression -> (label * expression) list result = fun e ->
+  match e.expression_content with
+  | E_record lst -> ok @@ LMap.to_kv_list lst
+  | _ -> fail @@ bad_kind "record" e.location
+
+let extract_map : expression -> (expression * expression) list result = fun e ->
+  match e.expression_content with
+  | E_map lst -> ok lst
+  | _ -> fail @@ bad_kind "map" e.location
diff --git a/src/stages/2-ast_complex/combinators.mli b/src/stages/2-ast_complex/combinators.mli
new file mode 100644
index 000000000..e9d3dd144
--- /dev/null
+++ b/src/stages/2-ast_complex/combinators.mli
@@ -0,0 +1,135 @@
+open Types
+open Simple_utils.Trace
+(*
+module Option = Simple_utils.Option
+
+module SMap = Map.String
+
+module Errors : sig
+  val bad_kind : name -> Location.t -> unit -> error
+end
+*)
+val make_t      : type_content -> type_expression
+val t_bool      : type_expression
+val t_string    : type_expression
+val t_bytes     : type_expression
+val t_int       : type_expression
+val t_operation : type_expression
+val t_nat       : type_expression
+val t_tez       : type_expression
+val t_unit      : type_expression
+val t_address   : type_expression
+val t_key       : type_expression
+val t_key_hash  : type_expression
+val t_timestamp : type_expression
+val t_signature : type_expression
+(*
+val t_option    : type_expression -> type_expression
+*)
+val t_list      : type_expression -> type_expression
+val t_variable  : string -> type_expression
+(*
+val t_record    : te_map -> type_expression
+*)
+val t_pair : ( type_expression * type_expression ) -> type_expression
+val t_tuple     : type_expression list -> type_expression
+
+val t_record : type_expression Map.String.t -> type_expression
+val t_record_ez : (string * type_expression) list -> type_expression
+
+val t_sum : type_expression Map.String.t -> type_expression
+val ez_t_sum : ( string * type_expression ) list -> type_expression
+
+val t_function : type_expression -> type_expression -> type_expression
+val t_map : type_expression -> type_expression -> type_expression
+
+val t_operator : type_operator -> type_expression list -> type_expression result
+val t_set : type_expression -> type_expression
+
+val make_expr : ?loc:Location.t -> expression_content -> expression
+val e_var : ?loc:Location.t -> string -> expression
+val e_literal : ?loc:Location.t -> literal -> expression
+val e_unit : ?loc:Location.t -> unit -> expression
+val e_int : ?loc:Location.t -> int -> expression 
+val e_nat : ?loc:Location.t -> int -> expression
+val e_timestamp : ?loc:Location.t -> int -> expression
+val e_bool : ?loc:Location.t -> bool -> expression
+val e_string : ?loc:Location.t -> string -> expression
+val e_address : ?loc:Location.t -> string -> expression 
+val e_signature : ?loc:Location.t -> string -> expression 
+val e_key : ?loc:Location.t -> string -> expression 
+val e_key_hash : ?loc:Location.t -> string -> expression 
+val e_chain_id : ?loc:Location.t -> string -> expression 
+val e_mutez : ?loc:Location.t -> int -> expression
+val e'_bytes : string -> expression_content result
+val e_bytes_hex : ?loc:Location.t -> string -> expression result
+val e_bytes_raw : ?loc:Location.t -> bytes -> expression
+val e_bytes_string : ?loc:Location.t -> string -> expression
+val e_big_map : ?loc:Location.t -> ( expr * expr ) list -> expression
+
+val e_record_ez  : ?loc:Location.t -> ( string * expr ) list -> expression
+val e_tuple : ?loc:Location.t -> expression list -> expression
+val e_some : ?loc:Location.t -> expression -> expression
+val e_none : ?loc:Location.t -> unit -> expression
+val e_string_cat : ?loc:Location.t -> expression -> expression -> expression
+val e_map_add : ?loc:Location.t -> expression -> expression ->  expression -> expression
+val e_map : ?loc:Location.t -> ( expression * expression ) list -> expression
+val e_set : ?loc:Location.t -> expression list -> expression
+val e_list : ?loc:Location.t -> expression list -> expression
+val e_pair : ?loc:Location.t -> expression -> expression -> expression
+val e_constructor : ?loc:Location.t -> string -> expression -> expression
+val e_matching : ?loc:Location.t -> expression -> matching_expr -> expression
+val e_matching_bool : ?loc:Location.t -> expression -> expression -> expression -> expression
+val e_accessor : ?loc:Location.t -> expression -> string -> expression
+val e_accessor_list : ?loc:Location.t -> expression -> string list -> expression
+val e_variable : ?loc:Location.t -> expression_variable -> expression
+val e_skip : ?loc:Location.t -> unit -> expression
+val e_sequence : ?loc:Location.t -> expression -> expression -> expression
+val e_cond: ?loc:Location.t -> expression -> expression -> expression -> expression
+val e_let_in : ?loc:Location.t -> ( expression_variable * type_expression option ) -> bool -> expression -> expression -> expression
+val e_annotation : ?loc:Location.t -> expression -> type_expression -> expression
+val e_application : ?loc:Location.t -> expression -> expression -> expression
+val e_binop    : ?loc:Location.t -> constant' -> expression -> expression -> expression
+val e_constant : ?loc:Location.t -> constant' -> expression list -> expression
+val e_look_up : ?loc:Location.t -> expression -> expression -> expression
+val ez_match_variant : ((string * string ) * 'a ) list -> ('a,unit) matching_content
+val e_matching_variant : ?loc:Location.t -> expression -> ((string * string) * expression) list -> expression
+
+val make_option_typed : ?loc:Location.t -> expression -> type_expression option -> expression
+
+val e_typed_none : ?loc:Location.t -> type_expression -> expression
+
+val e_typed_list : ?loc:Location.t -> expression list -> type_expression -> expression
+
+val e_typed_map : ?loc:Location.t -> ( expression * expression ) list  -> type_expression -> type_expression -> expression
+val e_typed_big_map : ?loc:Location.t -> ( expression * expression ) list  -> type_expression -> type_expression -> expression
+
+val e_typed_set : ?loc:Location.t -> expression list -> type_expression -> expression
+
+val e_lambda : ?loc:Location.t -> expression_variable -> type_expression option -> type_expression option -> expression -> expression
+val e_recursive : ?loc:Location.t -> expression_variable -> type_expression -> lambda -> expression
+val e_record : ?loc:Location.t -> expr Map.String.t -> expression
+val e_update : ?loc:Location.t -> expression -> string -> expression -> expression
+val e_assign_with_let : ?loc:Location.t -> string -> string list -> expression -> ((expression_variable*type_expression option)*bool*expression*bool)
+
+(*
+val get_e_accessor : expression' -> ( expression * access_path ) result
+*)
+
+val assert_e_accessor : expression_content -> unit result
+
+val get_e_pair : expression_content -> ( expression * expression ) result
+
+val get_e_list : expression_content -> ( expression list ) result
+val get_e_tuple : expression_content -> ( expression list ) result
+(*
+val get_e_failwith : expression -> expression result 
+val is_e_failwith : expression -> bool
+*)
+val extract_pair : expression -> ( expression * expression ) result 
+
+val extract_list : expression -> (expression list) result
+
+val extract_record : expression -> (label * expression) list result
+
+val extract_map : expression -> (expression * expression) list result
diff --git a/src/stages/2-ast_complex/dune b/src/stages/2-ast_complex/dune
new file mode 100644
index 000000000..4e1dac4af
--- /dev/null
+++ b/src/stages/2-ast_complex/dune
@@ -0,0 +1,13 @@
+(library
+  (name ast_complex)
+  (public_name ligo.ast_complex)
+  (libraries
+    simple-utils
+    tezos-utils
+    stage_common
+  )
+  (preprocess
+    (pps ppx_let bisect_ppx --conditional)
+  )
+  (flags (:standard -open Simple_utils ))
+)
diff --git a/src/stages/2-ast_complex/misc.ml b/src/stages/2-ast_complex/misc.ml
new file mode 100644
index 000000000..f2094d3ca
--- /dev/null
+++ b/src/stages/2-ast_complex/misc.ml
@@ -0,0 +1,331 @@
+open Trace
+open Types
+
+open Stage_common.Helpers
+module Errors = struct
+  let different_literals_because_different_types name a b () =
+    let title () = "literals have different types: " ^ name in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+
+  let different_literals name a b () =
+    let title () = name ^ " are different" in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+
+  let error_uncomparable_literals name a b () =
+    let title () = name ^ " are not comparable" in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+end
+open Errors
+
+let assert_literal_eq (a, b : literal * literal) : unit result =
+  match (a, b) with
+  | Literal_bool a, Literal_bool b when a = b -> ok ()
+  | Literal_bool _, Literal_bool _ -> fail @@ different_literals "different bools" a b
+  | Literal_bool _, _ -> fail @@ different_literals_because_different_types "bool vs non-bool" a b
+  | Literal_int a, Literal_int b when a = b -> ok ()
+  | Literal_int _, Literal_int _ -> fail @@ different_literals "different ints" a b
+  | Literal_int _, _ -> fail @@ different_literals_because_different_types "int vs non-int" a b
+  | Literal_nat a, Literal_nat b when a = b -> ok ()
+  | Literal_nat _, Literal_nat _ -> fail @@ different_literals "different nats" a b
+  | Literal_nat _, _ -> fail @@ different_literals_because_different_types "nat vs non-nat" a b
+  | Literal_timestamp a, Literal_timestamp b when a = b -> ok ()
+  | Literal_timestamp _, Literal_timestamp _ -> fail @@ different_literals "different timestamps" a b
+  | Literal_timestamp _, _ -> fail @@ different_literals_because_different_types "timestamp vs non-timestamp" a b
+  | Literal_mutez a, Literal_mutez b when a = b -> ok ()
+  | Literal_mutez _, Literal_mutez _ -> fail @@ different_literals "different tezs" a b
+  | Literal_mutez _, _ -> fail @@ different_literals_because_different_types "tez vs non-tez" a b
+  | Literal_string a, Literal_string b when a = b -> ok ()
+  | Literal_string _, Literal_string _ -> fail @@ different_literals "different strings" a b
+  | Literal_string _, _ -> fail @@ different_literals_because_different_types "string vs non-string" a b
+  | Literal_bytes a, Literal_bytes b when a = b -> ok ()
+  | Literal_bytes _, Literal_bytes _ -> fail @@ different_literals "different bytess" a b
+  | Literal_bytes _, _ -> fail @@ different_literals_because_different_types "bytes vs non-bytes" a b
+  | Literal_void, Literal_void -> ok ()
+  | Literal_void, _ -> fail @@ different_literals_because_different_types "void vs non-void" a b
+  | Literal_unit, Literal_unit -> ok ()
+  | Literal_unit, _ -> fail @@ different_literals_because_different_types "unit vs non-unit" a b
+  | Literal_address a, Literal_address b when a = b -> ok ()
+  | Literal_address _, Literal_address _ -> fail @@ different_literals "different addresss" a b
+  | Literal_address _, _ -> fail @@ different_literals_because_different_types "address vs non-address" a b
+  | Literal_operation _, Literal_operation _ -> fail @@ error_uncomparable_literals "can't compare operations" a b
+  | Literal_operation _, _ -> fail @@ different_literals_because_different_types "operation vs non-operation" a b
+  | Literal_signature a, Literal_signature b when a = b -> ok ()
+  | Literal_signature _, Literal_signature _ -> fail @@ different_literals "different signature" a b
+  | Literal_signature _, _ -> fail @@ different_literals_because_different_types "signature vs non-signature" a b
+  | Literal_key a, Literal_key b when a = b -> ok ()
+  | Literal_key _, Literal_key _ -> fail @@ different_literals "different key" a b
+  | Literal_key _, _ -> fail @@ different_literals_because_different_types "key vs non-key" a b
+  | Literal_key_hash a, Literal_key_hash b when a = b -> ok ()
+  | Literal_key_hash _, Literal_key_hash _ -> fail @@ different_literals "different key_hash" a b
+  | Literal_key_hash _, _ -> fail @@ different_literals_because_different_types "key_hash vs non-key_hash" a b
+  | Literal_chain_id a, Literal_chain_id b when a = b -> ok ()
+  | Literal_chain_id _, Literal_chain_id _ -> fail @@ different_literals "different chain_id" a b
+  | Literal_chain_id _, _ -> fail @@ different_literals_because_different_types "chain_id vs non-chain_id" a b
+
+let rec assert_value_eq (a, b: (expression * expression )) : unit result =
+  Format.printf "in assert_value_eq %a %a\n%!" PP.expression a PP.expression b;
+  let error_content () =
+    Format.asprintf "\n@[<v>- %a@;- %a]" PP.expression a PP.expression b
+  in
+  trace (fun () -> error (thunk "not equal") error_content ()) @@
+  match (a.expression_content , b.expression_content) with
+  | E_literal a , E_literal b ->
+      assert_literal_eq (a, b)
+  | E_literal _ , _ ->
+    simple_fail "comparing a literal with not a literal"
+  | E_constant (ca) , E_constant (cb) when ca.cons_name = cb.cons_name -> (
+      let%bind lst =
+        generic_try (simple_error "constants with different number of elements")
+          (fun () -> List.combine ca.arguments cb.arguments) in
+      let%bind _all = bind_list @@ List.map assert_value_eq lst in
+      ok ()
+    )
+  | E_constant _ , E_constant _ ->
+      simple_fail "different constants"
+  | E_constant _ , _ ->
+      let error_content () =
+        Format.asprintf "%a vs %a"
+          PP.expression a
+          PP.expression b
+      in
+      fail @@ (fun () -> error (thunk "comparing constant with other expression") error_content ())
+
+  | E_constructor (ca), E_constructor (cb) when ca.constructor = cb.constructor -> (
+      let%bind _eq = assert_value_eq (ca.element, cb.element) in
+      ok ()
+    )
+  | E_constructor _, E_constructor _ ->
+      simple_fail "different constructors"
+  | E_constructor _, _ ->
+      simple_fail "comparing constructor with other expression"
+
+
+  | E_record sma, E_record smb -> (
+      let aux _ a b =
+        match a, b with
+        | Some a, Some b -> Some (assert_value_eq (a, b))
+        | _ -> Some (simple_fail "different record keys")
+      in
+      let%bind _all = bind_lmap @@ LMap.merge aux sma smb in
+      ok ()
+    )
+  | E_record _, _ ->
+      simple_fail "comparing record with other expression"
+  
+  | E_record_update ura, E_record_update urb ->
+    let _ = 
+      generic_try (simple_error "Updating different record") @@ 
+      fun () -> assert_value_eq (ura.record, urb.record) in
+    let aux (Label a,Label b) =
+      assert (String.equal a b)
+    in
+    let () = aux (ura.path, urb.path) in
+    let%bind () = assert_value_eq (ura.update,urb.update) in
+    ok ()
+  | E_record_update _, _ ->
+     simple_fail "comparing record update with other expression"
+
+  | (E_map lsta, E_map lstb | E_big_map lsta, E_big_map lstb) -> (
+      let%bind lst = generic_try (simple_error "maps of different lengths")
+          (fun () ->
+             let lsta' = List.sort compare lsta in
+             let lstb' = List.sort compare lstb in
+             List.combine lsta' lstb') in
+      let aux = fun ((ka, va), (kb, vb)) ->
+        let%bind _ = assert_value_eq (ka, kb) in
+        let%bind _ = assert_value_eq (va, vb) in
+        ok () in
+      let%bind _all = bind_map_list aux lst in
+      ok ()
+    )
+  | (E_map _ | E_big_map _), _ ->
+      simple_fail "comparing map with other expression"
+
+  | E_list lsta, E_list lstb -> (
+      let%bind lst =
+        generic_try (simple_error "list of different lengths")
+          (fun () -> List.combine lsta lstb) in
+      let%bind _all = bind_map_list assert_value_eq lst in
+      ok ()
+    )
+  | E_list _, _ ->
+      simple_fail "comparing list with other expression"
+
+  | E_set lsta, E_set lstb -> (
+      let lsta' = List.sort (compare) lsta in
+      let lstb' = List.sort (compare) lstb in
+      let%bind lst =
+        generic_try (simple_error "set of different lengths")
+          (fun () -> List.combine lsta' lstb') in
+      let%bind _all = bind_map_list assert_value_eq lst in
+      ok ()
+    )
+  | E_set _, _ ->
+      simple_fail "comparing set with other expression"
+
+  | (E_ascription a ,  _b') -> assert_value_eq (a.anno_expr , b)
+  | (_a' , E_ascription b) -> assert_value_eq (a , b.anno_expr)
+  | (E_variable _, _) | (E_lambda _, _)
+  | (E_application _, _) | (E_let_in _, _)
+  | (E_recursive _,_) | (E_record_accessor _, _)
+  | (E_look_up _, _) | (E_matching _, _)
+  | (E_skip, _) -> simple_fail "comparing not a value"
+
+let is_value_eq (a , b) = to_bool @@ assert_value_eq (a , b)
+
+(* module Rename = struct
+ *   open Trace
+ *
+ *   module Type = struct
+ *     (\* Type renaming, not needed. Yet. *\)
+ *   end
+ * 
+ *   module Value = struct
+ *     type renaming = string * (string * access_path) (\* src -> dst *\)
+ *     type renamings = renaming list
+ *     let filter (r:renamings) (s:string) : renamings =
+ *       List.filter (fun (x, _) -> not (x = s)) r
+ *     let filters (r:renamings) (ss:string list) : renamings =
+ *       List.filter (fun (x, _) -> not (List.mem x ss)) r
+ * 
+ *     let rec rename_instruction (r:renamings) (i:instruction) : instruction result =
+ *       match i with
+ *       | I_assignment ({name;annotated_expression = e} as a) -> (
+ *           match List.assoc_opt name r with
+ *           | None ->
+ *               let%bind annotated_expression = rename_annotated_expression (filter r name) e in
+ *               ok (I_assignment {a with annotated_expression})
+ *           | Some (name', lst) -> (
+ *               let%bind annotated_expression = rename_annotated_expression r e in
+ *               match lst with
+ *               | [] -> ok (I_assignment {name = name' ; annotated_expression})
+ *               | lst ->
+ *                   let (hds, tl) =
+ *                     let open List in
+ *                     let r = rev lst in
+ *                     rev @@ tl r, hd r
+ *                   in
+ *                   let%bind tl' = match tl with
+ *                     | Access_record n -> ok n
+ *                     | Access_tuple _ -> simple_fail "no support for renaming into tuples yet" in
+ *                   ok (I_record_patch (name', hds, [tl', annotated_expression]))
+ *             )
+ *         )
+ *       | I_skip -> ok I_skip
+ *       | I_fail e ->
+ *           let%bind e' = rename_annotated_expression r e in
+ *           ok (I_fail e')
+ *       | I_loop (cond, body) ->
+ *           let%bind cond' = rename_annotated_expression r cond in
+ *           let%bind body' = rename_block r body in
+ *           ok (I_loop (cond', body'))
+ *       | I_matching (ae, m) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           let%bind m' = rename_matching rename_block r m in
+ *           ok (I_matching (ae', m'))
+ *       | I_record_patch (v, path, lst) ->
+ *           let aux (x, y) =
+ *             let%bind y' = rename_annotated_expression (filter r v) y in
+ *             ok (x, y') in
+ *           let%bind lst' = bind_map_list aux lst in
+ *           match List.assoc_opt v r with
+ *           | None -> (
+ *               ok (I_record_patch (v, path, lst'))
+ *             )
+ *           | Some (v', path') -> (
+ *               ok (I_record_patch (v', path' @ path, lst'))
+ *             )
+ *     and rename_block (r:renamings) (bl:block) : block result =
+ *       bind_map_list (rename_instruction r) bl
+ * 
+ *     and rename_matching : type a . (renamings -> a -> a result) -> renamings -> a matching -> a matching result =
+ *       fun f r m ->
+ *       match m with
+ *       | Match_bool { match_true = mt ; match_false = mf } ->
+ *           let%bind match_true = f r mt in
+ *           let%bind match_false = f r mf in
+ *           ok (Match_bool {match_true ; match_false})
+ *       | Match_option { match_none = mn ; match_some = (some, ms) } ->
+ *           let%bind match_none = f r mn in
+ *           let%bind ms' = f (filter r some) ms in
+ *           ok (Match_option {match_none ; match_some = (some, ms')})
+ *       | Match_list { match_nil = mn ; match_cons = (hd, tl, mc) } ->
+ *           let%bind match_nil = f r mn in
+ *           let%bind mc' = f (filters r [hd;tl]) mc in
+ *           ok (Match_list {match_nil ; match_cons = (hd, tl, mc')})
+ *       | Match_tuple (lst, body) ->
+ *           let%bind body' = f (filters r lst) body in
+ *           ok (Match_tuple (lst, body'))
+ * 
+ *     and rename_matching_instruction = fun x -> rename_matching rename_block x
+ * 
+ *     and rename_matching_expr = fun x -> rename_matching rename_expression x
+ * 
+ *     and rename_annotated_expression (r:renamings) (ae:annotated_expression) : annotated_expression result =
+ *       let%bind expression = rename_expression r ae.expression in
+ *       ok {ae with expression}
+ * 
+ *     and rename_expression : renamings -> expression -> expression result = fun r e ->
+ *       match e with
+ *       | E_literal _ as l -> ok l
+ *       | E_constant (name, lst) ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_constant (name, lst'))
+ *       | E_constructor (name, ae) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           ok (E_constructor (name, ae'))
+ *       | E_variable v -> (
+ *           match List.assoc_opt v r with
+ *           | None -> ok (E_variable v)
+ *           | Some (name, path) -> ok (E_accessor (ae (E_variable (name)), path))
+ *         )
+ *       | E_lambda ({binder;body;result} as l) ->
+ *           let r' = filter r binder in
+ *           let%bind body = rename_block r' body in
+ *           let%bind result = rename_annotated_expression r' result in
+ *           ok (E_lambda {l with body ; result})
+ *       | E_application (f, arg) ->
+ *           let%bind f' = rename_annotated_expression r f in
+ *           let%bind arg' = rename_annotated_expression r arg in
+ *           ok (E_application (f', arg'))
+ *       | E_tuple lst ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_tuple lst')
+ *       | E_accessor (ae, p) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           ok (E_accessor (ae', p))
+ *       | E_record sm ->
+ *           let%bind sm' = bind_smap
+ *             @@ SMap.map (rename_annotated_expression r) sm in
+ *           ok (E_record sm')
+ *       | E_map m ->
+ *           let%bind m' = bind_map_list
+ *             (fun (x, y) -> bind_map_pair (rename_annotated_expression r) (x, y)) m in
+ *           ok (E_map m')
+ *       | E_list lst ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_list lst')
+ *       | E_look_up m ->
+ *           let%bind m' = bind_map_pair (rename_annotated_expression r) m in
+ *           ok (E_look_up m')
+ *       | E_matching (ae, m) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           let%bind m' = rename_matching rename_annotated_expression r m in
+ *           ok (E_matching (ae', m'))
+ *   end
+ * end *)
diff --git a/src/stages/2-ast_complex/misc.mli b/src/stages/2-ast_complex/misc.mli
new file mode 100644
index 000000000..0784d109c
--- /dev/null
+++ b/src/stages/2-ast_complex/misc.mli
@@ -0,0 +1,20 @@
+open Trace
+open Types
+
+
+(*
+
+module Errors : sig
+  val different_literals_because_different_types : name -> literal -> literal -> unit -> error
+
+  val different_literals : name -> literal -> literal -> unit -> error
+
+  val error_uncomparable_literals : name -> literal -> literal -> unit -> error
+end
+
+val assert_literal_eq : ( literal * literal ) -> unit result
+*)
+
+val assert_value_eq : ( expression * expression ) -> unit result
+
+val is_value_eq : ( expression * expression ) -> bool
diff --git a/src/stages/2-ast_complex/types.ml b/src/stages/2-ast_complex/types.ml
new file mode 100644
index 000000000..70a348975
--- /dev/null
+++ b/src/stages/2-ast_complex/types.ml
@@ -0,0 +1,117 @@
+[@@@warning "-30"]
+
+module Location = Simple_utils.Location
+
+module Ast_complex_parameter = struct
+  type type_meta = unit
+end
+
+include Stage_common.Types
+
+(*include Ast_generic_type(Ast_simplified_parameter)
+*)
+include Ast_generic_type (Ast_complex_parameter)
+
+type inline = bool 
+type program = declaration Location.wrap list
+and declaration =
+  | Declaration_type of (type_variable * type_expression)
+
+  (* A Declaration_constant is described by
+   *   a name
+   *   an optional type annotation
+   *   a boolean indicating whether it should be inlined
+   *   an expression *)
+  | Declaration_constant of (expression_variable * type_expression option * inline * expression)
+
+(* | Macro_declaration of macro_declaration *)
+and expression = {expression_content: expression_content; location: Location.t}
+
+and expression_content =
+  (* Base *)
+  | E_literal of literal
+  | E_constant of constant (* For language constants, like (Cons hd tl) or (plus i j) *)
+  | E_variable of expression_variable
+  | E_application of application
+  | E_lambda of lambda
+  | E_recursive of recursive
+  | E_let_in of let_in
+  | E_skip
+  (* Variant *)
+  | E_constructor of constructor (* For user defined constructors *)
+  | E_matching of matching
+  (* Record *)
+  | E_record of expression label_map
+  | E_record_accessor of accessor
+  | E_record_update of update
+  (* Data Structures *)
+  (* TODO : move to constant*)
+  | E_map of (expression * expression) list (*move to operator *)
+  | E_big_map of (expression * expression) list (*move to operator *)
+  | E_list of expression list
+  | E_set of expression list
+  | E_look_up of (expression * expression)
+  (* Advanced *)
+  | E_ascription of ascription
+
+and constant =
+  { cons_name: constant' (* this is at the end because it is huge *)
+  ; arguments: expression list }
+
+and application = {expr1: expression; expr2: expression}
+
+and lambda =
+  { binder: expression_variable
+  ; input_type: type_expression option
+  ; output_type: type_expression option
+  ; result: expression }
+
+and recursive = {
+  fun_name :  expression_variable;
+  fun_type : type_expression;
+  lambda : lambda;
+}
+
+and let_in =
+  { let_binder: expression_variable * type_expression option
+  ; rhs: expression
+  ; let_result: expression
+  ; inline: bool }
+
+and constructor = {constructor: constructor'; element: expression}
+
+and accessor = {expr: expression; label: label}
+
+and update = {record: expression; path: label ; update: expression}
+
+and matching_expr = (expr,unit) matching_content
+and matching =
+  { matchee: expression
+  ; cases: matching_expr
+  }
+
+and ascription = {anno_expr: expression; type_annotation: type_expression}
+
+and environment_element_definition =
+  | ED_binder
+  | ED_declaration of (expression * free_variables)
+
+and free_variables = expression_variable list
+
+and environment_element =
+  { type_value: type_expression
+  ; source_environment: full_environment
+  ; definition: environment_element_definition }
+
+and environment = (expression_variable * environment_element) list
+
+and type_environment = (type_variable * type_expression) list
+
+(* SUBST ??? *)
+and small_environment = environment * type_environment
+
+and full_environment = small_environment List.Ne.t
+
+and expr = expression
+
+and texpr = type_expression
diff --git a/src/stages/3-ast_simplified/PP.ml b/src/stages/3-ast_simplified/PP.ml
new file mode 100644
index 000000000..fa4404307
--- /dev/null
+++ b/src/stages/3-ast_simplified/PP.ml
@@ -0,0 +1,138 @@
+[@@@coverage exclude_file]
+open Types
+open Format
+open PP_helpers
+
+include Stage_common.PP
+include Ast_PP_type(Ast_simplified_parameter)
+
+let expression_variable ppf (ev : expression_variable) : unit =
+  fprintf ppf "%a" Var.pp ev
+
+
+let rec expression ppf (e : expression) =
+  expression_content ppf e.expression_content
+and expression_content ppf (ec : expression_content) =
+  match ec with
+  | E_literal l ->
+      literal ppf l
+  | E_variable n ->
+      fprintf ppf "%a" expression_variable n
+  | E_application app ->
+      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_constructor c ->
+      fprintf ppf "%a(%a)" constructor c.constructor expression c.element
+  | E_constant c ->
+      fprintf ppf "%a(%a)" constant c.cons_name (list_sep_d expression)
+        c.arguments
+  | E_record m ->
+      fprintf ppf "%a" (tuple_or_record_sep_expr expression) m
+  | E_record_accessor ra ->
+      fprintf ppf "%a.%a" expression ra.expr label ra.label
+  | E_record_update {record; path; update} ->
+      fprintf ppf "{ %a with { %a = %a } }" expression record label path expression update
+  | E_map m ->
+      fprintf ppf "map[%a]" (list_sep_d assoc_expression) m
+  | E_big_map m ->
+      fprintf ppf "big_map[%a]" (list_sep_d assoc_expression) m
+  | E_list lst ->
+      fprintf ppf "list[%a]" (list_sep_d expression) lst
+  | E_set lst ->
+      fprintf ppf "set[%a]" (list_sep_d expression) lst
+  | E_look_up (ds, ind) ->
+      fprintf ppf "(%a)[%a]" expression ds expression ind
+  | E_lambda {binder; input_type; output_type; result} ->
+      fprintf ppf "lambda (%a:%a) : %a return %a"
+        expression_variable binder
+        (PP_helpers.option type_expression)
+        input_type
+        (PP_helpers.option type_expression)
+        output_type expression result
+  | E_recursive { fun_name; fun_type; lambda} ->
+      fprintf ppf "rec (%a:%a => %a )" 
+        expression_variable fun_name 
+        type_expression fun_type
+        expression_content (E_lambda lambda)
+  | E_matching {matchee; cases; _} ->
+      fprintf ppf "match %a with %a" expression matchee (matching expression)
+        cases
+  | E_let_in { let_binder ;rhs ; let_result; inline } ->    
+    fprintf ppf "let %a = %a%a in %a" option_type_name let_binder expression rhs option_inline inline expression let_result
+  | E_skip ->
+      fprintf ppf "skip"
+  | E_ascription {anno_expr; type_annotation} ->
+      fprintf ppf "%a : %a" expression anno_expr type_expression
+        type_annotation
+
+and option_type_name ppf
+    ((n, ty_opt) : expression_variable * type_expression option) =
+  match ty_opt with
+  | None ->
+      fprintf ppf "%a" expression_variable n
+  | Some ty ->
+      fprintf ppf "%a : %a" expression_variable n type_expression ty
+
+and assoc_expression ppf : expr * expr -> unit =
+ fun (a, b) -> fprintf ppf "%a -> %a" expression a expression b
+
+and single_record_patch ppf ((p, expr) : label * expr) =
+  fprintf ppf "%a <- %a" label p expression expr
+
+and matching_variant_case : type a . (_ -> a -> unit) -> _ -> (constructor' * expression_variable) * a -> unit =
+  fun f ppf ((c,n),a) ->
+  fprintf ppf "| %a %a -> %a" constructor c expression_variable n f a
+
+and matching : type a . (formatter -> a -> unit) -> formatter -> (a,unit) matching_content -> unit =
+  fun f ppf m -> match m with
+    | Match_tuple ((lst, b), _) ->
+        fprintf ppf "let (%a) = %a" (list_sep_d expression_variable) lst f b
+    | Match_variant (lst, _) ->
+        fprintf ppf "%a" (list_sep (matching_variant_case f) (tag "@.")) lst
+    | Match_bool {match_true ; match_false} ->
+        fprintf ppf "| True -> %a @.| False -> %a" f match_true f match_false
+    | Match_list {match_nil ; match_cons = (hd, tl, match_cons, _)} ->
+        fprintf ppf "| Nil -> %a @.| %a :: %a -> %a" f match_nil expression_variable hd expression_variable tl f match_cons
+    | Match_option {match_none ; match_some = (some, match_some, _)} ->
+        fprintf ppf "| None -> %a @.| Some %a -> %a" f match_none expression_variable some f match_some
+
+(* Shows the type expected for the matched value *)
+and matching_type ppf m = match m with
+  | Match_tuple _ ->
+      fprintf ppf "tuple"
+  | Match_variant (lst, _) ->
+      fprintf ppf "variant %a" (list_sep matching_variant_case_type (tag "@.")) lst
+  | Match_bool _ ->
+      fprintf ppf "boolean"
+  | Match_list _ ->
+      fprintf ppf "list"
+  | Match_option _ ->
+      fprintf ppf "option"
+
+and matching_variant_case_type ppf ((c,n),_a) =
+  fprintf ppf "| %a %a" constructor c expression_variable n
+
+and option_mut ppf mut = 
+  if mut then 
+    fprintf ppf "[@mut]"
+  else
+    fprintf ppf ""
+
+and option_inline ppf inline = 
+  if inline then 
+    fprintf ppf "[@inline]"
+  else
+    fprintf ppf ""
+
+let declaration ppf (d : declaration) =
+  match d with
+  | Declaration_type (type_name, te) ->
+      fprintf ppf "type %a = %a" type_variable type_name type_expression te
+  | Declaration_constant (name, ty_opt, i, expr) ->
+      fprintf ppf "const %a = %a%a" option_type_name (name, ty_opt) expression
+        expr
+        option_inline i
+
+let program ppf (p : program) =
+  fprintf ppf "@[<v>%a@]"
+    (list_sep declaration (tag "@;"))
+    (List.map Location.unwrap p)
diff --git a/src/stages/3-ast_simplified/ast_simplified.ml b/src/stages/3-ast_simplified/ast_simplified.ml
new file mode 100644
index 000000000..e9614490a
--- /dev/null
+++ b/src/stages/3-ast_simplified/ast_simplified.ml
@@ -0,0 +1,8 @@
+include Types
+
+(* include Misc *)
+include Combinators
+module Types = Types
+module Misc = Misc
+module PP=PP
+module Combinators = Combinators
diff --git a/src/stages/3-ast_simplified/combinators.ml b/src/stages/3-ast_simplified/combinators.ml
new file mode 100644
index 000000000..2a5e60aff
--- /dev/null
+++ b/src/stages/3-ast_simplified/combinators.ml
@@ -0,0 +1,268 @@
+open Types
+open Simple_utils.Trace
+module Option = Simple_utils.Option
+
+module SMap = Map.String
+
+module Errors = struct
+  let bad_kind expected location =
+    let title () = Format.asprintf "a %s was expected" expected in
+    let message () = "" in
+    let data = [
+      ("location" , fun () -> Format.asprintf "%a" Location.pp location) ;
+    ] in
+    error ~data title message
+  let bad_type_operator type_op =
+    let title () = Format.asprintf "bad type operator %a" (PP.type_operator PP.type_expression) type_op in
+    let message () = "" in
+    error title message
+end
+open Errors
+
+let make_t type_content = {type_content; type_meta = ()}
+
+  
+let tuple_to_record lst =
+  let aux (i,acc) el = (i+1,(string_of_int i, el)::acc) in
+  let (_, lst ) = List.fold_left aux (0,[]) lst in
+  lst
+
+let t_bool         : type_expression = make_t @@ T_constant (TC_bool)
+let t_string       : type_expression = make_t @@ T_constant (TC_string)
+let t_bytes        : type_expression = make_t @@ T_constant (TC_bytes)
+let t_int          : type_expression = make_t @@ T_constant (TC_int)
+let t_operation    : type_expression = make_t @@ T_constant (TC_operation)
+let t_nat          : type_expression = make_t @@ T_constant (TC_nat)
+let t_tez          : type_expression = make_t @@ T_constant (TC_mutez)
+let t_unit         : type_expression = make_t @@ T_constant (TC_unit)
+let t_address      : type_expression = make_t @@ T_constant (TC_address)
+let t_signature    : type_expression = make_t @@ T_constant (TC_signature)
+let t_key          : type_expression = make_t @@ T_constant (TC_key)
+let t_key_hash     : type_expression = make_t @@ T_constant (TC_key_hash)
+let t_timestamp    : type_expression = make_t @@ T_constant (TC_timestamp)
+let t_option  o    : type_expression = make_t @@ T_operator (TC_option o)
+let t_list  t      : type_expression = make_t @@ T_operator (TC_list t)
+let t_variable n   : type_expression = make_t @@ T_variable (Var.of_name n)
+let t_record_ez lst =
+  let lst = List.map (fun (k, v) -> (Label k, v)) lst in
+  let m = LMap.of_list lst in
+  make_t @@ T_record m
+let t_record m  : type_expression =
+  let lst = Map.String.to_kv_list m in
+  t_record_ez lst
+
+let t_pair (a , b) : type_expression = t_record_ez [("0",a) ; ("1",b)]
+let t_tuple lst    : type_expression = t_record_ez (tuple_to_record lst)
+
+let ez_t_sum (lst:(string * type_expression) list) : type_expression =
+  let aux prev (k, v) = CMap.add (Constructor k) v prev in
+  let map = List.fold_left aux CMap.empty lst in
+  make_t @@ T_sum map
+let t_sum m : type_expression =
+  let lst = Map.String.to_kv_list m in
+  ez_t_sum lst
+
+let t_function type1 type2  : type_expression = make_t @@ T_arrow {type1; type2}
+let t_map key value         : type_expression = make_t @@ T_operator (TC_map (key, value))
+let t_big_map key value     : type_expression = make_t @@ T_operator (TC_big_map (key , value))
+let t_set key               : type_expression = make_t @@ T_operator (TC_set key)
+let t_contract contract     : type_expression = make_t @@ T_operator (TC_contract contract)
+
+(* TODO find a better way than using list*)
+let t_operator op lst: type_expression result =
+  match op,lst with 
+  | TC_set _         , [t] -> ok @@ t_set t
+  | TC_list _        , [t] -> ok @@ t_list t
+  | TC_option _      , [t] -> ok @@ t_option t
+  | TC_map (_,_)     , [kt;vt] -> ok @@ t_map kt vt
+  | TC_big_map (_,_) , [kt;vt] -> ok @@ t_big_map kt vt
+  | TC_contract _    , [t] -> ok @@ t_contract t
+  | _ , _ -> fail @@ bad_type_operator op
+
+let make_expr ?(loc = Location.generated) expression_content =
+  let location = loc in
+  { expression_content; location }
+
+let e_var ?loc (n: string) : expression = make_expr ?loc @@ E_variable (Var.of_name n)
+let e_literal ?loc l : expression = make_expr ?loc @@ E_literal l
+let e_unit ?loc () : expression = make_expr ?loc @@ E_literal (Literal_unit)
+let e_int ?loc n : expression = make_expr ?loc @@ E_literal (Literal_int n)
+let e_nat ?loc n : expression = make_expr ?loc @@ E_literal (Literal_nat n)
+let e_timestamp ?loc n : expression = make_expr ?loc @@ E_literal (Literal_timestamp n)
+let e_bool ?loc   b : expression = make_expr ?loc @@ E_literal (Literal_bool b)
+let e_string ?loc s : expression = make_expr ?loc @@ E_literal (Literal_string s)
+let e_address ?loc s : expression = make_expr ?loc @@ E_literal (Literal_address s)
+let e_mutez ?loc s : expression = make_expr ?loc @@ E_literal (Literal_mutez s)
+let e_signature ?loc s : expression = make_expr ?loc @@ E_literal (Literal_signature s)
+let e_key ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key s)
+let e_key_hash ?loc s : expression = make_expr ?loc @@ E_literal (Literal_key_hash s)
+let e_chain_id ?loc s : expression = make_expr ?loc @@ E_literal (Literal_chain_id s)
+let e'_bytes b : expression_content result =
+  let%bind bytes = generic_try (simple_error "bad hex to bytes") (fun () -> Hex.to_bytes (`Hex b)) in
+  ok @@ E_literal (Literal_bytes bytes)
+let e_bytes_hex ?loc b : expression result =
+  let%bind e' = e'_bytes b in
+  ok @@ make_expr ?loc e'
+let e_bytes_raw ?loc (b: bytes) : expression =
+  make_expr ?loc @@ E_literal (Literal_bytes b)
+let e_bytes_string ?loc (s: string) : expression =
+  make_expr ?loc @@ E_literal (Literal_bytes (Hex.to_bytes (Hex.of_string s)))
+let e_big_map ?loc lst : expression = make_expr ?loc @@ E_big_map lst
+let e_some ?loc s  : expression = make_expr ?loc @@ E_constant {cons_name = C_SOME; arguments = [s]}
+let e_none ?loc () : expression = make_expr ?loc @@ E_constant {cons_name = C_NONE; arguments = []}
+let e_string_cat ?loc sl sr : expression = make_expr ?loc @@ E_constant {cons_name = C_CONCAT; arguments = [sl ; sr ]}
+let e_map_add ?loc k v old  : expression = make_expr ?loc @@ E_constant {cons_name = C_MAP_ADD; arguments = [k ; v ; old]}
+let e_map ?loc lst : expression = make_expr ?loc @@ E_map lst
+let e_set ?loc lst : expression = make_expr ?loc @@ E_set lst
+let e_list ?loc lst : expression = make_expr ?loc @@ E_list lst
+let e_constructor ?loc s a : expression = make_expr ?loc @@ E_constructor { constructor = Constructor s; element = a}
+let e_matching ?loc a b : expression = make_expr ?loc @@ E_matching {matchee=a;cases=b}
+let e_matching_bool ?loc a b c : expression = e_matching ?loc a (Match_bool {match_true = b ; match_false = c})
+let e_accessor ?loc a b = make_expr ?loc @@ E_record_accessor {expr = a; label= Label b}
+let e_accessor_list ?loc a b  = List.fold_left (fun a b -> e_accessor ?loc a b) a b
+let e_variable ?loc v = make_expr ?loc @@ E_variable v
+let e_skip ?loc () = make_expr ?loc @@ E_skip
+let e_let_in ?loc (binder, ascr) inline rhs let_result = 
+  make_expr ?loc @@ E_let_in { let_binder = (binder,ascr) ; rhs ; let_result; inline }
+let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
+let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
+let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
+let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
+let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false expr1 expr2
+let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
+(*
+let e_assign ?loc a b c = location_wrap ?loc @@ E_assign (Var.of_name a , b , c) (* TODO handlethat*)
+*)
+let ez_match_variant (lst : ((string * string) * 'a) list) =
+  let lst = List.map (fun ((c,n),a) -> ((Constructor c, Var.of_name n), a) ) lst in
+  Match_variant (lst,())
+let e_matching_variant ?loc a (lst : ((string * string)* 'a) list) =
+  e_matching ?loc a (ez_match_variant lst)
+let e_record_ez ?loc (lst : (string * expr) list) : expression =
+  let map = List.fold_left (fun m (x, y) -> LMap.add (Label x) y m) LMap.empty lst in
+  make_expr ?loc @@ E_record map
+let e_record ?loc map =
+  let lst = Map.String.to_kv_list map in
+  e_record_ez ?loc lst 
+
+let e_update ?loc record path update = 
+  let path = Label path in
+  make_expr ?loc @@ E_record_update {record; path; update}
+
+let e_tuple ?loc lst : expression = e_record_ez ?loc (tuple_to_record lst)
+let e_pair ?loc a b  : expression = e_tuple ?loc [a;b]
+
+let make_option_typed ?loc e t_opt =
+  match t_opt with
+  | None -> e
+  | Some t -> e_annotation ?loc e t
+
+
+let e_typed_none ?loc t_opt =
+  let type_annotation = t_option t_opt in
+  e_annotation ?loc (e_none ?loc ()) type_annotation
+
+let e_typed_list ?loc lst t =
+  e_annotation ?loc (e_list lst) (t_list t)
+
+let e_typed_map ?loc lst k v = e_annotation ?loc (e_map lst) (t_map k v)
+let e_typed_big_map ?loc lst k v = e_annotation ?loc (e_big_map lst) (t_big_map k v)
+
+let e_typed_set ?loc lst k = e_annotation ?loc (e_set lst) (t_set k)
+
+
+let e_lambda ?loc (binder : expression_variable)
+    (input_type : type_expression option)
+    (output_type : type_expression option)
+    (result : expression)
+  : expression =
+  make_expr ?loc @@ E_lambda {
+    binder = binder ;
+    input_type = input_type ;
+    output_type = output_type ;
+    result ;
+  }
+let e_recursive ?loc fun_name fun_type lambda = make_expr ?loc @@ E_recursive {fun_name; fun_type; lambda}
+
+
+let e_assign_with_let ?loc var access_path expr = 
+  let var = Var.of_name (var) in
+  match access_path with 
+  | [] -> (var, None), true, expr, false
+
+  | lst -> 
+    let rec aux path record= match path with 
+    | [] -> failwith "acces_path cannot be empty"
+    | [e] -> e_update ?loc record e expr
+    | elem::tail -> 
+      let next_record = e_accessor record elem in
+      e_update ?loc record elem (aux tail next_record )
+    in 
+    (var, None), true, (aux lst (e_variable var)), false
+
+let get_e_accessor = fun t ->
+  match t with
+  | E_record_accessor {expr; label} -> ok (expr , label)
+  | _ -> simple_fail "not an accessor"
+
+let assert_e_accessor = fun t ->
+  let%bind _ = get_e_accessor t in
+  ok ()
+
+let get_e_pair = fun t ->
+  match t with
+  | E_record r -> ( 
+  let lst = LMap.to_kv_list r in
+    match lst with 
+    | [(Label "O",a);(Label "1",b)]
+    | [(Label "1",b);(Label "0",a)] -> 
+        ok (a , b)
+    | _ -> simple_fail "not a pair"
+    )
+  | _ -> simple_fail "not a pair"
+
+let get_e_list = fun t ->
+  match t with
+  | E_list lst -> ok lst
+  | _ -> simple_fail "not a list"
+
+let tuple_of_record (m: _ LMap.t) =
+  let aux i = 
+    let opt = LMap.find_opt (Label (string_of_int i)) m in
+    Option.bind (fun opt -> Some (opt,i+1)) opt
+  in
+  Base.Sequence.to_list @@ Base.Sequence.unfold ~init:0 ~f:aux
+
+let get_e_tuple = fun t ->
+  match t with
+  | E_record r -> ok @@ tuple_of_record r
+  | _ -> simple_fail "ast_simplified: get_e_tuple: not a tuple"
+
+(* Same as get_e_pair *)
+let extract_pair : expression -> (expression * expression) result = fun e ->
+  match e.expression_content with
+  | E_record r -> ( 
+  let lst = LMap.to_kv_list r in
+    match lst with 
+    | [(Label "O",a);(Label "1",b)]
+    | [(Label "1",b);(Label "0",a)] -> 
+        ok (a , b)
+    | _ -> fail @@ bad_kind "pair" e.location
+    )
+  | _ -> fail @@ bad_kind "pair" e.location
+
+let extract_list : expression -> (expression list) result = fun e ->
+  match e.expression_content with
+  | E_list lst -> ok lst
+  | _ -> fail @@ bad_kind "list" e.location
+
+let extract_record : expression -> (label * expression) list result = fun e ->
+  match e.expression_content with
+  | E_record lst -> ok @@ LMap.to_kv_list lst
+  | _ -> fail @@ bad_kind "record" e.location
+
+let extract_map : expression -> (expression * expression) list result = fun e ->
+  match e.expression_content with
+  | E_map lst -> ok lst
+  | _ -> fail @@ bad_kind "map" e.location
diff --git a/src/stages/3-ast_simplified/combinators.mli b/src/stages/3-ast_simplified/combinators.mli
new file mode 100644
index 000000000..e9d3dd144
--- /dev/null
+++ b/src/stages/3-ast_simplified/combinators.mli
@@ -0,0 +1,135 @@
+open Types
+open Simple_utils.Trace
+(*
+module Option = Simple_utils.Option
+
+module SMap = Map.String
+
+module Errors : sig
+  val bad_kind : name -> Location.t -> unit -> error
+end
+*)
+val make_t      : type_content -> type_expression
+val t_bool      : type_expression
+val t_string    : type_expression
+val t_bytes     : type_expression
+val t_int       : type_expression
+val t_operation : type_expression
+val t_nat       : type_expression
+val t_tez       : type_expression
+val t_unit      : type_expression
+val t_address   : type_expression
+val t_key       : type_expression
+val t_key_hash  : type_expression
+val t_timestamp : type_expression
+val t_signature : type_expression
+(*
+val t_option    : type_expression -> type_expression
+*)
+val t_list      : type_expression -> type_expression
+val t_variable  : string -> type_expression
+(*
+val t_record    : te_map -> type_expression
+*)
+val t_pair : ( type_expression * type_expression ) -> type_expression
+val t_tuple     : type_expression list -> type_expression
+
+val t_record : type_expression Map.String.t -> type_expression
+val t_record_ez : (string * type_expression) list -> type_expression
+
+val t_sum : type_expression Map.String.t -> type_expression
+val ez_t_sum : ( string * type_expression ) list -> type_expression
+
+val t_function : type_expression -> type_expression -> type_expression
+val t_map : type_expression -> type_expression -> type_expression
+
+val t_operator : type_operator -> type_expression list -> type_expression result
+val t_set : type_expression -> type_expression
+
+val make_expr : ?loc:Location.t -> expression_content -> expression
+val e_var : ?loc:Location.t -> string -> expression
+val e_literal : ?loc:Location.t -> literal -> expression
+val e_unit : ?loc:Location.t -> unit -> expression
+val e_int : ?loc:Location.t -> int -> expression 
+val e_nat : ?loc:Location.t -> int -> expression
+val e_timestamp : ?loc:Location.t -> int -> expression
+val e_bool : ?loc:Location.t -> bool -> expression
+val e_string : ?loc:Location.t -> string -> expression
+val e_address : ?loc:Location.t -> string -> expression 
+val e_signature : ?loc:Location.t -> string -> expression 
+val e_key : ?loc:Location.t -> string -> expression 
+val e_key_hash : ?loc:Location.t -> string -> expression 
+val e_chain_id : ?loc:Location.t -> string -> expression 
+val e_mutez : ?loc:Location.t -> int -> expression
+val e'_bytes : string -> expression_content result
+val e_bytes_hex : ?loc:Location.t -> string -> expression result
+val e_bytes_raw : ?loc:Location.t -> bytes -> expression
+val e_bytes_string : ?loc:Location.t -> string -> expression
+val e_big_map : ?loc:Location.t -> ( expr * expr ) list -> expression
+
+val e_record_ez  : ?loc:Location.t -> ( string * expr ) list -> expression
+val e_tuple : ?loc:Location.t -> expression list -> expression
+val e_some : ?loc:Location.t -> expression -> expression
+val e_none : ?loc:Location.t -> unit -> expression
+val e_string_cat : ?loc:Location.t -> expression -> expression -> expression
+val e_map_add : ?loc:Location.t -> expression -> expression ->  expression -> expression
+val e_map : ?loc:Location.t -> ( expression * expression ) list -> expression
+val e_set : ?loc:Location.t -> expression list -> expression
+val e_list : ?loc:Location.t -> expression list -> expression
+val e_pair : ?loc:Location.t -> expression -> expression -> expression
+val e_constructor : ?loc:Location.t -> string -> expression -> expression
+val e_matching : ?loc:Location.t -> expression -> matching_expr -> expression
+val e_matching_bool : ?loc:Location.t -> expression -> expression -> expression -> expression
+val e_accessor : ?loc:Location.t -> expression -> string -> expression
+val e_accessor_list : ?loc:Location.t -> expression -> string list -> expression
+val e_variable : ?loc:Location.t -> expression_variable -> expression
+val e_skip : ?loc:Location.t -> unit -> expression
+val e_sequence : ?loc:Location.t -> expression -> expression -> expression
+val e_cond: ?loc:Location.t -> expression -> expression -> expression -> expression
+val e_let_in : ?loc:Location.t -> ( expression_variable * type_expression option ) -> bool -> expression -> expression -> expression
+val e_annotation : ?loc:Location.t -> expression -> type_expression -> expression
+val e_application : ?loc:Location.t -> expression -> expression -> expression
+val e_binop    : ?loc:Location.t -> constant' -> expression -> expression -> expression
+val e_constant : ?loc:Location.t -> constant' -> expression list -> expression
+val e_look_up : ?loc:Location.t -> expression -> expression -> expression
+val ez_match_variant : ((string * string ) * 'a ) list -> ('a,unit) matching_content
+val e_matching_variant : ?loc:Location.t -> expression -> ((string * string) * expression) list -> expression
+
+val make_option_typed : ?loc:Location.t -> expression -> type_expression option -> expression
+
+val e_typed_none : ?loc:Location.t -> type_expression -> expression
+
+val e_typed_list : ?loc:Location.t -> expression list -> type_expression -> expression
+
+val e_typed_map : ?loc:Location.t -> ( expression * expression ) list  -> type_expression -> type_expression -> expression
+val e_typed_big_map : ?loc:Location.t -> ( expression * expression ) list  -> type_expression -> type_expression -> expression
+
+val e_typed_set : ?loc:Location.t -> expression list -> type_expression -> expression
+
+val e_lambda : ?loc:Location.t -> expression_variable -> type_expression option -> type_expression option -> expression -> expression
+val e_recursive : ?loc:Location.t -> expression_variable -> type_expression -> lambda -> expression
+val e_record : ?loc:Location.t -> expr Map.String.t -> expression
+val e_update : ?loc:Location.t -> expression -> string -> expression -> expression
+val e_assign_with_let : ?loc:Location.t -> string -> string list -> expression -> ((expression_variable*type_expression option)*bool*expression*bool)
+
+(*
+val get_e_accessor : expression' -> ( expression * access_path ) result
+*)
+
+val assert_e_accessor : expression_content -> unit result
+
+val get_e_pair : expression_content -> ( expression * expression ) result
+
+val get_e_list : expression_content -> ( expression list ) result
+val get_e_tuple : expression_content -> ( expression list ) result
+(*
+val get_e_failwith : expression -> expression result 
+val is_e_failwith : expression -> bool
+*)
+val extract_pair : expression -> ( expression * expression ) result 
+
+val extract_list : expression -> (expression list) result
+
+val extract_record : expression -> (label * expression) list result
+
+val extract_map : expression -> (expression * expression) list result
diff --git a/src/stages/ast_simplified/dune b/src/stages/3-ast_simplified/dune
similarity index 100%
rename from src/stages/ast_simplified/dune
rename to src/stages/3-ast_simplified/dune
diff --git a/src/stages/3-ast_simplified/misc.ml b/src/stages/3-ast_simplified/misc.ml
new file mode 100644
index 000000000..f2094d3ca
--- /dev/null
+++ b/src/stages/3-ast_simplified/misc.ml
@@ -0,0 +1,331 @@
+open Trace
+open Types
+
+open Stage_common.Helpers
+module Errors = struct
+  let different_literals_because_different_types name a b () =
+    let title () = "literals have different types: " ^ name in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+
+  let different_literals name a b () =
+    let title () = name ^ " are different" in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+
+  let error_uncomparable_literals name a b () =
+    let title () = name ^ " are not comparable" in
+    let message () = "" in
+    let data = [
+      ("a" , fun () -> Format.asprintf "%a" PP.literal a) ;
+      ("b" , fun () -> Format.asprintf "%a" PP.literal b )
+    ] in
+    error ~data title message ()
+end
+open Errors
+
+let assert_literal_eq (a, b : literal * literal) : unit result =
+  match (a, b) with
+  | Literal_bool a, Literal_bool b when a = b -> ok ()
+  | Literal_bool _, Literal_bool _ -> fail @@ different_literals "different bools" a b
+  | Literal_bool _, _ -> fail @@ different_literals_because_different_types "bool vs non-bool" a b
+  | Literal_int a, Literal_int b when a = b -> ok ()
+  | Literal_int _, Literal_int _ -> fail @@ different_literals "different ints" a b
+  | Literal_int _, _ -> fail @@ different_literals_because_different_types "int vs non-int" a b
+  | Literal_nat a, Literal_nat b when a = b -> ok ()
+  | Literal_nat _, Literal_nat _ -> fail @@ different_literals "different nats" a b
+  | Literal_nat _, _ -> fail @@ different_literals_because_different_types "nat vs non-nat" a b
+  | Literal_timestamp a, Literal_timestamp b when a = b -> ok ()
+  | Literal_timestamp _, Literal_timestamp _ -> fail @@ different_literals "different timestamps" a b
+  | Literal_timestamp _, _ -> fail @@ different_literals_because_different_types "timestamp vs non-timestamp" a b
+  | Literal_mutez a, Literal_mutez b when a = b -> ok ()
+  | Literal_mutez _, Literal_mutez _ -> fail @@ different_literals "different tezs" a b
+  | Literal_mutez _, _ -> fail @@ different_literals_because_different_types "tez vs non-tez" a b
+  | Literal_string a, Literal_string b when a = b -> ok ()
+  | Literal_string _, Literal_string _ -> fail @@ different_literals "different strings" a b
+  | Literal_string _, _ -> fail @@ different_literals_because_different_types "string vs non-string" a b
+  | Literal_bytes a, Literal_bytes b when a = b -> ok ()
+  | Literal_bytes _, Literal_bytes _ -> fail @@ different_literals "different bytess" a b
+  | Literal_bytes _, _ -> fail @@ different_literals_because_different_types "bytes vs non-bytes" a b
+  | Literal_void, Literal_void -> ok ()
+  | Literal_void, _ -> fail @@ different_literals_because_different_types "void vs non-void" a b
+  | Literal_unit, Literal_unit -> ok ()
+  | Literal_unit, _ -> fail @@ different_literals_because_different_types "unit vs non-unit" a b
+  | Literal_address a, Literal_address b when a = b -> ok ()
+  | Literal_address _, Literal_address _ -> fail @@ different_literals "different addresss" a b
+  | Literal_address _, _ -> fail @@ different_literals_because_different_types "address vs non-address" a b
+  | Literal_operation _, Literal_operation _ -> fail @@ error_uncomparable_literals "can't compare operations" a b
+  | Literal_operation _, _ -> fail @@ different_literals_because_different_types "operation vs non-operation" a b
+  | Literal_signature a, Literal_signature b when a = b -> ok ()
+  | Literal_signature _, Literal_signature _ -> fail @@ different_literals "different signature" a b
+  | Literal_signature _, _ -> fail @@ different_literals_because_different_types "signature vs non-signature" a b
+  | Literal_key a, Literal_key b when a = b -> ok ()
+  | Literal_key _, Literal_key _ -> fail @@ different_literals "different key" a b
+  | Literal_key _, _ -> fail @@ different_literals_because_different_types "key vs non-key" a b
+  | Literal_key_hash a, Literal_key_hash b when a = b -> ok ()
+  | Literal_key_hash _, Literal_key_hash _ -> fail @@ different_literals "different key_hash" a b
+  | Literal_key_hash _, _ -> fail @@ different_literals_because_different_types "key_hash vs non-key_hash" a b
+  | Literal_chain_id a, Literal_chain_id b when a = b -> ok ()
+  | Literal_chain_id _, Literal_chain_id _ -> fail @@ different_literals "different chain_id" a b
+  | Literal_chain_id _, _ -> fail @@ different_literals_because_different_types "chain_id vs non-chain_id" a b
+
+let rec assert_value_eq (a, b: (expression * expression )) : unit result =
+  Format.printf "in assert_value_eq %a %a\n%!" PP.expression a PP.expression b;
+  let error_content () =
+    Format.asprintf "\n@[<v>- %a@;- %a]" PP.expression a PP.expression b
+  in
+  trace (fun () -> error (thunk "not equal") error_content ()) @@
+  match (a.expression_content , b.expression_content) with
+  | E_literal a , E_literal b ->
+      assert_literal_eq (a, b)
+  | E_literal _ , _ ->
+    simple_fail "comparing a literal with not a literal"
+  | E_constant (ca) , E_constant (cb) when ca.cons_name = cb.cons_name -> (
+      let%bind lst =
+        generic_try (simple_error "constants with different number of elements")
+          (fun () -> List.combine ca.arguments cb.arguments) in
+      let%bind _all = bind_list @@ List.map assert_value_eq lst in
+      ok ()
+    )
+  | E_constant _ , E_constant _ ->
+      simple_fail "different constants"
+  | E_constant _ , _ ->
+      let error_content () =
+        Format.asprintf "%a vs %a"
+          PP.expression a
+          PP.expression b
+      in
+      fail @@ (fun () -> error (thunk "comparing constant with other expression") error_content ())
+
+  | E_constructor (ca), E_constructor (cb) when ca.constructor = cb.constructor -> (
+      let%bind _eq = assert_value_eq (ca.element, cb.element) in
+      ok ()
+    )
+  | E_constructor _, E_constructor _ ->
+      simple_fail "different constructors"
+  | E_constructor _, _ ->
+      simple_fail "comparing constructor with other expression"
+
+
+  | E_record sma, E_record smb -> (
+      let aux _ a b =
+        match a, b with
+        | Some a, Some b -> Some (assert_value_eq (a, b))
+        | _ -> Some (simple_fail "different record keys")
+      in
+      let%bind _all = bind_lmap @@ LMap.merge aux sma smb in
+      ok ()
+    )
+  | E_record _, _ ->
+      simple_fail "comparing record with other expression"
+  
+  | E_record_update ura, E_record_update urb ->
+    let _ = 
+      generic_try (simple_error "Updating different record") @@ 
+      fun () -> assert_value_eq (ura.record, urb.record) in
+    let aux (Label a,Label b) =
+      assert (String.equal a b)
+    in
+    let () = aux (ura.path, urb.path) in
+    let%bind () = assert_value_eq (ura.update,urb.update) in
+    ok ()
+  | E_record_update _, _ ->
+     simple_fail "comparing record update with other expression"
+
+  | (E_map lsta, E_map lstb | E_big_map lsta, E_big_map lstb) -> (
+      let%bind lst = generic_try (simple_error "maps of different lengths")
+          (fun () ->
+             let lsta' = List.sort compare lsta in
+             let lstb' = List.sort compare lstb in
+             List.combine lsta' lstb') in
+      let aux = fun ((ka, va), (kb, vb)) ->
+        let%bind _ = assert_value_eq (ka, kb) in
+        let%bind _ = assert_value_eq (va, vb) in
+        ok () in
+      let%bind _all = bind_map_list aux lst in
+      ok ()
+    )
+  | (E_map _ | E_big_map _), _ ->
+      simple_fail "comparing map with other expression"
+
+  | E_list lsta, E_list lstb -> (
+      let%bind lst =
+        generic_try (simple_error "list of different lengths")
+          (fun () -> List.combine lsta lstb) in
+      let%bind _all = bind_map_list assert_value_eq lst in
+      ok ()
+    )
+  | E_list _, _ ->
+      simple_fail "comparing list with other expression"
+
+  | E_set lsta, E_set lstb -> (
+      let lsta' = List.sort (compare) lsta in
+      let lstb' = List.sort (compare) lstb in
+      let%bind lst =
+        generic_try (simple_error "set of different lengths")
+          (fun () -> List.combine lsta' lstb') in
+      let%bind _all = bind_map_list assert_value_eq lst in
+      ok ()
+    )
+  | E_set _, _ ->
+      simple_fail "comparing set with other expression"
+
+  | (E_ascription a ,  _b') -> assert_value_eq (a.anno_expr , b)
+  | (_a' , E_ascription b) -> assert_value_eq (a , b.anno_expr)
+  | (E_variable _, _) | (E_lambda _, _)
+  | (E_application _, _) | (E_let_in _, _)
+  | (E_recursive _,_) | (E_record_accessor _, _)
+  | (E_look_up _, _) | (E_matching _, _)
+  | (E_skip, _) -> simple_fail "comparing not a value"
+
+let is_value_eq (a , b) = to_bool @@ assert_value_eq (a , b)
+
+(* module Rename = struct
+ *   open Trace
+ *
+ *   module Type = struct
+ *     (\* Type renaming, not needed. Yet. *\)
+ *   end
+ * 
+ *   module Value = struct
+ *     type renaming = string * (string * access_path) (\* src -> dst *\)
+ *     type renamings = renaming list
+ *     let filter (r:renamings) (s:string) : renamings =
+ *       List.filter (fun (x, _) -> not (x = s)) r
+ *     let filters (r:renamings) (ss:string list) : renamings =
+ *       List.filter (fun (x, _) -> not (List.mem x ss)) r
+ * 
+ *     let rec rename_instruction (r:renamings) (i:instruction) : instruction result =
+ *       match i with
+ *       | I_assignment ({name;annotated_expression = e} as a) -> (
+ *           match List.assoc_opt name r with
+ *           | None ->
+ *               let%bind annotated_expression = rename_annotated_expression (filter r name) e in
+ *               ok (I_assignment {a with annotated_expression})
+ *           | Some (name', lst) -> (
+ *               let%bind annotated_expression = rename_annotated_expression r e in
+ *               match lst with
+ *               | [] -> ok (I_assignment {name = name' ; annotated_expression})
+ *               | lst ->
+ *                   let (hds, tl) =
+ *                     let open List in
+ *                     let r = rev lst in
+ *                     rev @@ tl r, hd r
+ *                   in
+ *                   let%bind tl' = match tl with
+ *                     | Access_record n -> ok n
+ *                     | Access_tuple _ -> simple_fail "no support for renaming into tuples yet" in
+ *                   ok (I_record_patch (name', hds, [tl', annotated_expression]))
+ *             )
+ *         )
+ *       | I_skip -> ok I_skip
+ *       | I_fail e ->
+ *           let%bind e' = rename_annotated_expression r e in
+ *           ok (I_fail e')
+ *       | I_loop (cond, body) ->
+ *           let%bind cond' = rename_annotated_expression r cond in
+ *           let%bind body' = rename_block r body in
+ *           ok (I_loop (cond', body'))
+ *       | I_matching (ae, m) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           let%bind m' = rename_matching rename_block r m in
+ *           ok (I_matching (ae', m'))
+ *       | I_record_patch (v, path, lst) ->
+ *           let aux (x, y) =
+ *             let%bind y' = rename_annotated_expression (filter r v) y in
+ *             ok (x, y') in
+ *           let%bind lst' = bind_map_list aux lst in
+ *           match List.assoc_opt v r with
+ *           | None -> (
+ *               ok (I_record_patch (v, path, lst'))
+ *             )
+ *           | Some (v', path') -> (
+ *               ok (I_record_patch (v', path' @ path, lst'))
+ *             )
+ *     and rename_block (r:renamings) (bl:block) : block result =
+ *       bind_map_list (rename_instruction r) bl
+ * 
+ *     and rename_matching : type a . (renamings -> a -> a result) -> renamings -> a matching -> a matching result =
+ *       fun f r m ->
+ *       match m with
+ *       | Match_bool { match_true = mt ; match_false = mf } ->
+ *           let%bind match_true = f r mt in
+ *           let%bind match_false = f r mf in
+ *           ok (Match_bool {match_true ; match_false})
+ *       | Match_option { match_none = mn ; match_some = (some, ms) } ->
+ *           let%bind match_none = f r mn in
+ *           let%bind ms' = f (filter r some) ms in
+ *           ok (Match_option {match_none ; match_some = (some, ms')})
+ *       | Match_list { match_nil = mn ; match_cons = (hd, tl, mc) } ->
+ *           let%bind match_nil = f r mn in
+ *           let%bind mc' = f (filters r [hd;tl]) mc in
+ *           ok (Match_list {match_nil ; match_cons = (hd, tl, mc')})
+ *       | Match_tuple (lst, body) ->
+ *           let%bind body' = f (filters r lst) body in
+ *           ok (Match_tuple (lst, body'))
+ * 
+ *     and rename_matching_instruction = fun x -> rename_matching rename_block x
+ * 
+ *     and rename_matching_expr = fun x -> rename_matching rename_expression x
+ * 
+ *     and rename_annotated_expression (r:renamings) (ae:annotated_expression) : annotated_expression result =
+ *       let%bind expression = rename_expression r ae.expression in
+ *       ok {ae with expression}
+ * 
+ *     and rename_expression : renamings -> expression -> expression result = fun r e ->
+ *       match e with
+ *       | E_literal _ as l -> ok l
+ *       | E_constant (name, lst) ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_constant (name, lst'))
+ *       | E_constructor (name, ae) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           ok (E_constructor (name, ae'))
+ *       | E_variable v -> (
+ *           match List.assoc_opt v r with
+ *           | None -> ok (E_variable v)
+ *           | Some (name, path) -> ok (E_accessor (ae (E_variable (name)), path))
+ *         )
+ *       | E_lambda ({binder;body;result} as l) ->
+ *           let r' = filter r binder in
+ *           let%bind body = rename_block r' body in
+ *           let%bind result = rename_annotated_expression r' result in
+ *           ok (E_lambda {l with body ; result})
+ *       | E_application (f, arg) ->
+ *           let%bind f' = rename_annotated_expression r f in
+ *           let%bind arg' = rename_annotated_expression r arg in
+ *           ok (E_application (f', arg'))
+ *       | E_tuple lst ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_tuple lst')
+ *       | E_accessor (ae, p) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           ok (E_accessor (ae', p))
+ *       | E_record sm ->
+ *           let%bind sm' = bind_smap
+ *             @@ SMap.map (rename_annotated_expression r) sm in
+ *           ok (E_record sm')
+ *       | E_map m ->
+ *           let%bind m' = bind_map_list
+ *             (fun (x, y) -> bind_map_pair (rename_annotated_expression r) (x, y)) m in
+ *           ok (E_map m')
+ *       | E_list lst ->
+ *           let%bind lst' = bind_map_list (rename_annotated_expression r) lst in
+ *           ok (E_list lst')
+ *       | E_look_up m ->
+ *           let%bind m' = bind_map_pair (rename_annotated_expression r) m in
+ *           ok (E_look_up m')
+ *       | E_matching (ae, m) ->
+ *           let%bind ae' = rename_annotated_expression r ae in
+ *           let%bind m' = rename_matching rename_annotated_expression r m in
+ *           ok (E_matching (ae', m'))
+ *   end
+ * end *)
diff --git a/src/stages/3-ast_simplified/misc.mli b/src/stages/3-ast_simplified/misc.mli
new file mode 100644
index 000000000..0784d109c
--- /dev/null
+++ b/src/stages/3-ast_simplified/misc.mli
@@ -0,0 +1,20 @@
+open Trace
+open Types
+
+
+(*
+
+module Errors : sig
+  val different_literals_because_different_types : name -> literal -> literal -> unit -> error
+
+  val different_literals : name -> literal -> literal -> unit -> error
+
+  val error_uncomparable_literals : name -> literal -> literal -> unit -> error
+end
+
+val assert_literal_eq : ( literal * literal ) -> unit result
+*)
+
+val assert_value_eq : ( expression * expression ) -> unit result
+
+val is_value_eq : ( expression * expression ) -> bool
diff --git a/src/stages/ast_simplified/types.ml b/src/stages/3-ast_simplified/types.ml
similarity index 98%
rename from src/stages/ast_simplified/types.ml
rename to src/stages/3-ast_simplified/types.ml
index 696dbd028..ef2e32f36 100644
--- a/src/stages/ast_simplified/types.ml
+++ b/src/stages/3-ast_simplified/types.ml
@@ -34,8 +34,8 @@ and expression_content =
   | E_variable of expression_variable
   | E_application of application
   | E_lambda of lambda
-  | E_let_in of let_in
   | E_recursive of recursive
+  | E_let_in of let_in
   | E_skip
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
@@ -61,24 +61,23 @@ and constant =
 and application = {expr1: expression; expr2: expression}
 
 and lambda =
-  { binder: expression_variable 
+  { binder: expression_variable
   ; input_type: type_expression option
   ; output_type: type_expression option
   ; result: expression }
 
-and let_in =
-  { let_binder: expression_variable * type_expression option
-  ; mut: bool
-  ; rhs: expression
-  ; let_result: expression
-  ; inline: bool }
-
 and recursive = {
   fun_name :  expression_variable;
   fun_type : type_expression;
   lambda : lambda;
 }
 
+and let_in =
+  { let_binder: expression_variable * type_expression option
+  ; rhs: expression
+  ; let_result: expression
+  ; inline: bool }
+
 and constructor = {constructor: constructor'; element: expression}
 
 and accessor = {expr: expression; label: label}
diff --git a/src/stages/ast_typed/PP.ml b/src/stages/4-ast_typed/PP.ml
similarity index 100%
rename from src/stages/ast_typed/PP.ml
rename to src/stages/4-ast_typed/PP.ml
diff --git a/src/stages/ast_typed/ast_typed.ml b/src/stages/4-ast_typed/ast_typed.ml
similarity index 100%
rename from src/stages/ast_typed/ast_typed.ml
rename to src/stages/4-ast_typed/ast_typed.ml
diff --git a/src/stages/ast_typed/combinators.ml b/src/stages/4-ast_typed/combinators.ml
similarity index 100%
rename from src/stages/ast_typed/combinators.ml
rename to src/stages/4-ast_typed/combinators.ml
diff --git a/src/stages/ast_typed/combinators.mli b/src/stages/4-ast_typed/combinators.mli
similarity index 100%
rename from src/stages/ast_typed/combinators.mli
rename to src/stages/4-ast_typed/combinators.mli
diff --git a/src/stages/ast_typed/combinators_environment.ml b/src/stages/4-ast_typed/combinators_environment.ml
similarity index 100%
rename from src/stages/ast_typed/combinators_environment.ml
rename to src/stages/4-ast_typed/combinators_environment.ml
diff --git a/src/stages/ast_typed/combinators_environment.mli b/src/stages/4-ast_typed/combinators_environment.mli
similarity index 100%
rename from src/stages/ast_typed/combinators_environment.mli
rename to src/stages/4-ast_typed/combinators_environment.mli
diff --git a/src/stages/ast_typed/dune b/src/stages/4-ast_typed/dune
similarity index 100%
rename from src/stages/ast_typed/dune
rename to src/stages/4-ast_typed/dune
diff --git a/src/stages/ast_typed/environment.ml b/src/stages/4-ast_typed/environment.ml
similarity index 100%
rename from src/stages/ast_typed/environment.ml
rename to src/stages/4-ast_typed/environment.ml
diff --git a/src/stages/ast_typed/environment.mli b/src/stages/4-ast_typed/environment.mli
similarity index 100%
rename from src/stages/ast_typed/environment.mli
rename to src/stages/4-ast_typed/environment.mli
diff --git a/src/stages/ast_typed/misc.ml b/src/stages/4-ast_typed/misc.ml
similarity index 100%
rename from src/stages/ast_typed/misc.ml
rename to src/stages/4-ast_typed/misc.ml
diff --git a/src/stages/ast_typed/misc.mli b/src/stages/4-ast_typed/misc.mli
similarity index 100%
rename from src/stages/ast_typed/misc.mli
rename to src/stages/4-ast_typed/misc.mli
diff --git a/src/stages/ast_typed/misc_smart.ml b/src/stages/4-ast_typed/misc_smart.ml
similarity index 100%
rename from src/stages/ast_typed/misc_smart.ml
rename to src/stages/4-ast_typed/misc_smart.ml
diff --git a/src/stages/ast_typed/misc_smart.mli b/src/stages/4-ast_typed/misc_smart.mli
similarity index 100%
rename from src/stages/ast_typed/misc_smart.mli
rename to src/stages/4-ast_typed/misc_smart.mli
diff --git a/src/stages/ast_typed/types.ml b/src/stages/4-ast_typed/types.ml
similarity index 100%
rename from src/stages/ast_typed/types.ml
rename to src/stages/4-ast_typed/types.ml
diff --git a/src/stages/mini_c/PP.ml b/src/stages/5-mini_c/PP.ml
similarity index 100%
rename from src/stages/mini_c/PP.ml
rename to src/stages/5-mini_c/PP.ml
diff --git a/src/stages/mini_c/PP.mli b/src/stages/5-mini_c/PP.mli
similarity index 100%
rename from src/stages/mini_c/PP.mli
rename to src/stages/5-mini_c/PP.mli
diff --git a/src/stages/mini_c/combinators.ml b/src/stages/5-mini_c/combinators.ml
similarity index 100%
rename from src/stages/mini_c/combinators.ml
rename to src/stages/5-mini_c/combinators.ml
diff --git a/src/stages/mini_c/combinators.mli b/src/stages/5-mini_c/combinators.mli
similarity index 100%
rename from src/stages/mini_c/combinators.mli
rename to src/stages/5-mini_c/combinators.mli
diff --git a/src/stages/mini_c/combinators_smart.ml b/src/stages/5-mini_c/combinators_smart.ml
similarity index 100%
rename from src/stages/mini_c/combinators_smart.ml
rename to src/stages/5-mini_c/combinators_smart.ml
diff --git a/src/stages/mini_c/dune b/src/stages/5-mini_c/dune
similarity index 100%
rename from src/stages/mini_c/dune
rename to src/stages/5-mini_c/dune
diff --git a/src/stages/mini_c/environment.ml b/src/stages/5-mini_c/environment.ml
similarity index 100%
rename from src/stages/mini_c/environment.ml
rename to src/stages/5-mini_c/environment.ml
diff --git a/src/stages/mini_c/environment.mli b/src/stages/5-mini_c/environment.mli
similarity index 100%
rename from src/stages/mini_c/environment.mli
rename to src/stages/5-mini_c/environment.mli
diff --git a/src/stages/mini_c/mini_c.ml b/src/stages/5-mini_c/mini_c.ml
similarity index 100%
rename from src/stages/mini_c/mini_c.ml
rename to src/stages/5-mini_c/mini_c.ml
diff --git a/src/stages/mini_c/misc.ml b/src/stages/5-mini_c/misc.ml
similarity index 100%
rename from src/stages/mini_c/misc.ml
rename to src/stages/5-mini_c/misc.ml
diff --git a/src/stages/mini_c/types.ml b/src/stages/5-mini_c/types.ml
similarity index 100%
rename from src/stages/mini_c/types.ml
rename to src/stages/5-mini_c/types.ml
diff --git a/src/stages/typesystem/misc.ml b/src/stages/typesystem/misc.ml
index 10a59f4bc..223a94610 100644
--- a/src/stages/typesystem/misc.ml
+++ b/src/stages/typesystem/misc.ml
@@ -89,7 +89,7 @@ module Substitution = struct
           let _TODO = substs in
           failwith "TODO: T_function"
 
-    and s_simpl_type_content : Ast_simplified.type_content w = fun ~substs -> function
+    and s_abstr_type_content : Ast_simplified.type_content w = fun ~substs -> function
       | Ast_simplified.T_sum _ -> failwith "TODO: subst: unimplemented case s_type_expression sum"
       | Ast_simplified.T_record _ -> failwith "TODO: subst: unimplemented case s_type_expression record"
       | Ast_simplified.T_arrow _ -> failwith "TODO: subst: unimplemented case s_type_expression arrow"
@@ -97,20 +97,20 @@ module Substitution = struct
       | Ast_simplified.T_operator op ->
          let%bind op =
            Ast_simplified.bind_map_type_operator
-             (s_simpl_type_expression ~substs)
+             (s_abstr_type_expression ~substs)
              op in
          (* TODO: when we have generalized operators, we might need to subst the operator name itself? *)
          ok @@ Ast_simplified.T_operator op
       | Ast_simplified.T_constant constant ->
          ok @@ Ast_simplified.T_constant constant
 
-    and s_simpl_type_expression : Ast_simplified.type_expression w = fun ~substs {type_content;type_meta} ->
-      let%bind type_content = s_simpl_type_content ~substs type_content in
+    and s_abstr_type_expression : Ast_simplified.type_expression w = fun ~substs {type_content;type_meta} ->
+      let%bind type_content = s_abstr_type_content ~substs type_content in
       ok @@ Ast_simplified.{type_content;type_meta}
 
     and s_type_expression : T.type_expression w = fun ~substs { type_content; type_meta } ->
       let%bind type_content = s_type_content ~substs type_content in
-      let%bind type_meta = bind_map_option (s_simpl_type_expression ~substs) type_meta in
+      let%bind type_meta = bind_map_option (s_abstr_type_expression ~substs) type_meta in
       ok @@ T.{ type_content; type_meta}
     and s_literal : T.literal w = fun ~substs -> function
       | T.Literal_unit ->

From 6dfd2dac32a294e8d6ee69cd06198d25d964c7c1 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Thu, 12 Mar 2020 23:24:10 +0100
Subject: [PATCH 36/43] test passed

---
 src/test/coase_tests.ml            | 11 ++++++-----
 src/test/hash_lock_tests.ml        | 11 ++++++-----
 src/test/id_tests.ml               |  7 ++++---
 src/test/integration_tests.ml      | 12 +++++++++---
 src/test/md_file_tests.ml          |  4 +++-
 src/test/multisig_tests.ml         | 18 ++++++++++--------
 src/test/multisig_v2_tests.ml      | 13 +++++++------
 src/test/pledge_tests.ml           | 11 ++++++-----
 src/test/replaceable_id_tests.ml   |  7 ++++---
 src/test/time_lock_repeat_tests.ml |  7 ++++---
 src/test/time_lock_tests.ml        |  7 ++++---
 src/test/vote_tests.ml             |  4 +++-
 12 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/src/test/coase_tests.ml b/src/test/coase_tests.ml
index 5df29091f..b773764f9 100644
--- a/src/test/coase_tests.ml
+++ b/src/test/coase_tests.ml
@@ -4,7 +4,9 @@ open Trace
 open Test_helpers
 
 let type_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -20,10 +22,9 @@ let get_program =
       )
 
 let compile_main () = 
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/coase.ligo" (Syntax_name "pascaligo") in
-  let%bind typed_prg,_     = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
-  let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
-  let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
+  let%bind typed_prg      = get_program () in
+  let%bind mini_c_prg     = Ligo.Compile.Of_typed.compile typed_prg in
+  let%bind michelson_prg  = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
diff --git a/src/test/hash_lock_tests.ml b/src/test/hash_lock_tests.ml
index 7a6db1ea8..9ebfe3618 100644
--- a/src/test/hash_lock_tests.ml
+++ b/src/test/hash_lock_tests.ml
@@ -3,7 +3,9 @@ open Test_helpers
 open Ast_simplified
 
 let type_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -18,10 +20,9 @@ let get_program =
       )
 
 let compile_main () =
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/hashlock.mligo" (Syntax_name "cameligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
-  let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
-  let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
+  let%bind typed_prg,_   = get_program () in
+  let%bind mini_c_prg    = Ligo.Compile.Of_typed.compile typed_prg in
+  let%bind michelson_prg = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
diff --git a/src/test/id_tests.ml b/src/test/id_tests.ml
index 294cd08ff..bedc465db 100644
--- a/src/test/id_tests.ml
+++ b/src/test/id_tests.ml
@@ -4,7 +4,9 @@ open Ast_simplified
 
 
 let mtype_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok (typed,state)
 
@@ -19,8 +21,7 @@ let get_program =
       )
 
 let compile_main () =
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/id.mligo" (Syntax_name "cameligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed_prg,_     = get_program () in
   let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
   let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 9c17f2479..9fcb5f261 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -4,18 +4,24 @@ open Test_helpers
 open Ast_simplified.Combinators
 
 let retype_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
   let () = Typer.Solver.discard_state state in
   let () = Typer.Solver.discard_state state in
   ok typed
 let mtype_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
   let () = Typer.Solver.discard_state state in
   ok typed
 let type_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
   let () = Typer.Solver.discard_state state in
   ok typed
diff --git a/src/test/md_file_tests.ml b/src/test/md_file_tests.ml
index 14748f9c8..042c6ebaa 100644
--- a/src/test/md_file_tests.ml
+++ b/src/test/md_file_tests.ml
@@ -68,7 +68,9 @@ let compile_groups _filename grp_list =
     (fun ((s,grp),contents) ->
       trace (failed_to_compile_md_file _filename (s,grp,contents)) @@
       let%bind v_syntax   = Compile.Helpers.syntax_to_variant (Syntax_name s) None in
-      let%bind simplified = Compile.Of_source.compile_string contents v_syntax in
+      let%bind abstracted = Compile.Of_source.compile_string contents v_syntax in
+      let%bind complex    = Ligo.Compile.Of_abstracted.compile abstracted in
+      let%bind simplified = Ligo.Compile.Of_complex.compile complex in
       let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
       let%bind mini_c     = Compile.Of_typed.compile typed in
       bind_map_list
diff --git a/src/test/multisig_tests.ml b/src/test/multisig_tests.ml
index 704171e01..0866302c0 100644
--- a/src/test/multisig_tests.ml
+++ b/src/test/multisig_tests.ml
@@ -6,7 +6,9 @@ let mfile = "./contracts/multisig.mligo"
 let refile = "./contracts/multisig.religo"
 
 let type_file f s =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name s) in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name s) in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -175,12 +177,12 @@ let main = test_suite "Multisig" [
     test "valid_2_of_3 (mligo)"          (valid_2_of_3       mfile "cameligo");
     test "invalid_3_of_3 (mligo)"        (invalid_3_of_3     mfile "cameligo");
     test "not_enough_2_of_3 (mligo)"     (not_enough_2_of_3  mfile "cameligo");
-    test "compile (religo)"              (compile_main refile "reasonligo");
+    test "compile (religo)"              (compile_main       refile "reasonligo");
     test "unmatching_counter (religo)"   (unmatching_counter refile "reasonligo");
-    test "valid_1_of_1 (religo)"         (valid_1_of_1 refile "reasonligo");
-    test "invalid_1_of_1 (religo)"       (invalid_1_of_1 refile "reasonligo");
-    test "not_enough_signature (religo)" (not_enough_1_of_2 refile "reasonligo");
-    test "valid_2_of_3 (religo)"         (valid_2_of_3 refile "reasonligo");
-    test "invalid_3_of_3 (religo)"       (invalid_3_of_3 refile "reasonligo");
-    test "not_enough_2_of_3 (religo)"    (not_enough_2_of_3 refile "reasonligo");
+    test "valid_1_of_1 (religo)"         (valid_1_of_1       refile "reasonligo");
+    test "invalid_1_of_1 (religo)"       (invalid_1_of_1     refile "reasonligo");
+    test "not_enough_signature (religo)" (not_enough_1_of_2  refile "reasonligo");
+    test "valid_2_of_3 (religo)"         (valid_2_of_3       refile "reasonligo");
+    test "invalid_3_of_3 (religo)"       (invalid_3_of_3     refile "reasonligo");
+    test "not_enough_2_of_3 (religo)"    (not_enough_2_of_3  refile "reasonligo");
   ]
diff --git a/src/test/multisig_v2_tests.ml b/src/test/multisig_v2_tests.ml
index 391be83d2..01248c2dd 100644
--- a/src/test/multisig_v2_tests.ml
+++ b/src/test/multisig_v2_tests.ml
@@ -2,7 +2,9 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -17,10 +19,9 @@ let get_program =
       )
 
 let compile_main () = 
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/multisig-v2.ligo" (Syntax_name "pascaligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
-  let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
-  let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
+  let%bind typed_prg,_   = get_program () in 
+  let%bind mini_c_prg    = Ligo.Compile.Of_typed.compile typed_prg in
+  let%bind michelson_prg = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
@@ -35,7 +36,7 @@ let empty_message = e_lambda (Var.of_name "arguments")
   empty_op_list
 let empty_message2 = e_lambda (Var.of_name "arguments")
   (Some t_bytes) (Some (t_list t_operation))
- ( e_let_in ((Var.of_name "foo"),Some t_unit) false false (e_unit ()) empty_op_list)
+ ( e_let_in ((Var.of_name "foo"),Some t_unit) false (e_unit ()) empty_op_list)
 
 let send_param msg = e_constructor "Send" msg
 let withdraw_param = e_constructor "Withdraw" empty_message
diff --git a/src/test/pledge_tests.ml b/src/test/pledge_tests.ml
index d6af4f369..7d8d0abcf 100644
--- a/src/test/pledge_tests.ml
+++ b/src/test/pledge_tests.ml
@@ -4,7 +4,9 @@ open Ast_simplified
 
 
 let retype_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
   ok (typed,state)
 
@@ -19,10 +21,9 @@ let get_program =
       )
 
 let compile_main () =
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/pledge.religo" (Syntax_name "reasonligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile Env simplified in
-  let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
-  let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
+  let%bind typed_prg,_    = get_program () in
+  let%bind mini_c_prg     = Ligo.Compile.Of_typed.compile typed_prg in
+  let%bind michelson_prg  = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
diff --git a/src/test/replaceable_id_tests.ml b/src/test/replaceable_id_tests.ml
index 60bcb203e..b3623025c 100644
--- a/src/test/replaceable_id_tests.ml
+++ b/src/test/replaceable_id_tests.ml
@@ -2,7 +2,9 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -17,8 +19,7 @@ let get_program =
       )
 
 let compile_main () = 
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/replaceable_id.ligo" (Syntax_name "pascaligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed_prg,_     = get_program () in 
   let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
   let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
diff --git a/src/test/time_lock_repeat_tests.ml b/src/test/time_lock_repeat_tests.ml
index b5a3f7427..35c70cfa3 100644
--- a/src/test/time_lock_repeat_tests.ml
+++ b/src/test/time_lock_repeat_tests.ml
@@ -3,7 +3,9 @@ open Test_helpers
 open Ast_simplified
 
 let type_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -18,8 +20,7 @@ let get_program =
       )
 
 let compile_main () =
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/timelock_repeat.mligo" (Syntax_name "cameligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed_prg,_     = type_file "./contracts/timelock_repeat.mligo" in
   let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
   let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
diff --git a/src/test/time_lock_tests.ml b/src/test/time_lock_tests.ml
index eb3001f49..d5247b3cd 100644
--- a/src/test/time_lock_tests.ml
+++ b/src/test/time_lock_tests.ml
@@ -2,7 +2,9 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 
@@ -17,8 +19,7 @@ let get_program =
       )
 
 let compile_main () = 
-  let%bind simplified      = Ligo.Compile.Of_source.compile "./contracts/time-lock.ligo" (Syntax_name "pascaligo") in
-  let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed_prg,_     =  type_file "./contracts/time-lock.ligo" in
   let%bind mini_c_prg      = Ligo.Compile.Of_typed.compile typed_prg in
   let%bind michelson_prg   = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in
   let%bind (_contract: Tezos_utils.Michelson.michelson) =
diff --git a/src/test/vote_tests.ml b/src/test/vote_tests.ml
index ddc3d620d..c572ce340 100644
--- a/src/test/vote_tests.ml
+++ b/src/test/vote_tests.ml
@@ -2,7 +2,9 @@ open Trace
 open Test_helpers
 
 let type_file f =
-  let%bind simplified  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
+  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
+  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
   let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
   ok @@ (typed,state)
 

From 8b3877a92c13ff7a0156678d3570b03256930be1 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 16 Mar 2020 14:28:05 +0100
Subject: [PATCH 37/43] rename AST to imperative, sugar and core. Factor code
 in compile

---
 .../contributors/big-picture/middle-end.md    |   2 +-
 .../docs/contributors/ligo_test_guide.md      |   2 +-
 src/bin/cli.ml                                | 128 +++++-------------
 src/main/compile/dune                         |   8 +-
 src/main/compile/helpers.ml                   |  36 ++---
 .../compile/{of_simplified.ml => of_core.ml}  |  22 +--
 .../{of_abstracted.ml => of_imperative.ml}    |   4 +-
 .../compile/{of_complex.ml => of_sugar.ml}    |   6 +-
 src/main/compile/utils.ml                     |  65 +++++++++
 src/main/run/dune                             |   2 +-
 src/passes/2-abstracter/camligo.ml.old        |   2 +-
 src/passes/2-abstracter/pascaligo.mli         |   4 +-
 src/passes/4-Instruction_remover/dune         |   2 +-
 .../instruction_remover.ml                    |   2 +-
 src/passes/5-self_ast_complex/dune            |   6 +-
 src/passes/6-simplifier/dune                  |   4 +-
 src/passes/6-simplifier/simplifier.ml         |   4 +-
 src/passes/7-self_ast_simplified/dune         |   6 +-
 src/passes/8-typer-new/dune                   |   2 +-
 src/passes/8-typer-new/solver.ml              |   2 +-
 src/passes/8-typer-new/typer.ml               |  16 +--
 src/passes/8-typer-new/typer.ml.old           |   4 +-
 src/passes/8-typer-new/typer.mli              |   2 +-
 src/passes/8-typer-old/dune                   |   2 +-
 src/passes/8-typer-old/typer.ml               |   2 +-
 src/passes/8-typer-old/typer.mli              |   2 +-
 src/passes/8-typer/dune                       |   2 +-
 src/passes/8-typer/typer.ml                   |   2 +-
 src/passes/8-typer/typer.mli                  |   2 +-
 src/passes/operators/dune                     |   4 +-
 src/passes/operators/operators.ml             |   2 +-
 src/stages/1-ast_imperative/combinators.ml    |   2 +-
 src/stages/1-ast_imperative/types.ml          |   2 +-
 .../{2-ast_complex => 2-ast_sugar}/PP.ml      |   2 +-
 .../ast_sugar.ml}                             |   0
 .../combinators.ml                            |   2 +-
 .../combinators.mli                           |   0
 .../{2-ast_complex => 2-ast_sugar}/dune       |   4 +-
 .../{2-ast_complex => 2-ast_sugar}/misc.ml    |   0
 .../{2-ast_complex => 2-ast_sugar}/misc.mli   |   0
 .../{2-ast_complex => 2-ast_sugar}/types.ml   |   6 +-
 .../{3-ast_simplified => 3-ast_core}/PP.ml    |   2 +-
 .../ast_core.ml}                              |   0
 .../combinators.ml                            |   2 +-
 .../combinators.mli                           |   0
 .../{3-ast_simplified => 3-ast_core}/dune     |   4 +-
 .../{3-ast_simplified => 3-ast_core}/misc.ml  |   0
 .../{3-ast_simplified => 3-ast_core}/misc.mli |   0
 .../{3-ast_simplified => 3-ast_core}/types.ml |   6 +-
 src/stages/4-ast_typed/combinators.ml         |   2 +-
 src/stages/4-ast_typed/dune                   |   2 +-
 src/stages/4-ast_typed/types.ml               |   2 +-
 src/stages/typesystem/misc.ml                 |  24 ++--
 src/test/coase_tests.ml                       |   9 +-
 src/test/hash_lock_tests.ml                   |   7 +-
 src/test/id_tests.ml                          |   7 +-
 src/test/integration_tests.ml                 |  82 +++++------
 src/test/md_file_tests.ml                     |   8 +-
 src/test/multisig_tests.ml                    |   7 +-
 src/test/multisig_v2_tests.ml                 |   7 +-
 src/test/pledge_tests.ml                      |   7 +-
 src/test/replaceable_id_tests.ml              |   7 +-
 src/test/test_helpers.ml                      |  40 +++---
 src/test/time_lock_repeat_tests.ml            |   7 +-
 src/test/time_lock_tests.ml                   |   7 +-
 src/test/typer_tests.ml                       |   6 +-
 src/test/vote_tests.ml                        |  11 +-
 67 files changed, 292 insertions(+), 331 deletions(-)
 rename src/main/compile/{of_simplified.ml => of_core.ml} (59%)
 rename src/main/compile/{of_abstracted.ml => of_imperative.ml} (79%)
 rename src/main/compile/{of_complex.ml => of_sugar.ml} (74%)
 create mode 100644 src/main/compile/utils.ml
 rename src/stages/{2-ast_complex => 2-ast_sugar}/PP.ml (99%)
 rename src/stages/{2-ast_complex/ast_complex.ml => 2-ast_sugar/ast_sugar.ml} (100%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/combinators.ml (99%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/combinators.mli (100%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/dune (77%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/misc.ml (100%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/misc.mli (100%)
 rename src/stages/{2-ast_complex => 2-ast_sugar}/types.ml (95%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/PP.ml (99%)
 rename src/stages/{3-ast_simplified/ast_simplified.ml => 3-ast_core/ast_core.ml} (100%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/combinators.ml (99%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/combinators.mli (100%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/dune (75%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/misc.ml (100%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/misc.mli (100%)
 rename src/stages/{3-ast_simplified => 3-ast_core}/types.ml (95%)

diff --git a/gitlab-pages/docs/contributors/big-picture/middle-end.md b/gitlab-pages/docs/contributors/big-picture/middle-end.md
index 6dac7f5ec..f7cd04a8b 100644
--- a/gitlab-pages/docs/contributors/big-picture/middle-end.md
+++ b/gitlab-pages/docs/contributors/big-picture/middle-end.md
@@ -6,7 +6,7 @@ title: Middle End
 The Middle-End is the core of LIGO. It is also composed of three parts.
 ## Common AST
 The Common AST is the closest thing to what could be called “LIGO lang”. As such, it should be as simple as possible. Collapsing particular cases in more general constructs is encouraged. Documenting it is crucial for people who’ll write new parsers or editor support for Front-end related things.
-Its files are in `ast_simplified/`, of interest is the definition of the AST itself in `ast_simplified/types.ml`.
+Its files are in `ast_core/`, of interest is the definition of the AST itself in `ast_core/types.ml`.
 ## Type Checker
 The Type Checker, among other things, checks that a given AST is valid with regard to type-safety. It also annotates expressions with their types, free-variables and local environments.
 As time passes, we want to make the type-system stronger, to encode arbitrarily complex properties in an extensible manner.
diff --git a/gitlab-pages/docs/contributors/ligo_test_guide.md b/gitlab-pages/docs/contributors/ligo_test_guide.md
index eea05d77d..f8be06001 100644
--- a/gitlab-pages/docs/contributors/ligo_test_guide.md
+++ b/gitlab-pages/docs/contributors/ligo_test_guide.md
@@ -102,7 +102,7 @@ What's going on is similar to the last program: `expect_eq_evaluate` runs a prog
 
 For example, once the program stops running the value of `address` is `"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"`. The *comparison*, however, is made to a constructed expression.  
 
-Remember that we're testing from OCaml, but the program is written and evaluated as LIGO. In order to provide a proper comparison, we convert our expected test values into LIGO expressions and data. Constructors such as `e_list` and `e_address` provide a bridge between LIGO and OCaml. Their definitions can be found in files such as [src/stages/ast_simplified/combinators.ml](https://gitlab.com/ligolang/ligo/blob/dev/src/stages/ast_simplified/combinators.ml), or using [Merlin's definition point finder](https://github.com/ocaml/merlin/wiki). These same functions are used during the simplification stage of LIGO compilation, so becoming familiar with them will help prepare you to work on the [front end](contributors/big-picture/front-end/).
+Remember that we're testing from OCaml, but the program is written and evaluated as LIGO. In order to provide a proper comparison, we convert our expected test values into LIGO expressions and data. Constructors such as `e_list` and `e_address` provide a bridge between LIGO and OCaml. Their definitions can be found in files such as [src/stages/ast_core/combinators.ml](https://gitlab.com/ligolang/ligo/blob/dev/src/stages/ast_core/combinators.ml), or using [Merlin's definition point finder](https://github.com/ocaml/merlin/wiki). These same functions are used during the simplification stage of LIGO compilation, so becoming familiar with them will help prepare you to work on the [front end](contributors/big-picture/front-end/).
 
 ## How To Write A Test For LIGO
 
diff --git a/src/bin/cli.ml b/src/bin/cli.ml
index 2a1f21744..7292d66c1 100644
--- a/src/bin/cli.ml
+++ b/src/bin/cli.ml
@@ -140,10 +140,7 @@ module Run = Ligo.Run.Of_michelson
 let compile_file =
   let f source_file entry_point syntax display_format disable_typecheck michelson_format =
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complexed  = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complexed in
-    let%bind typed,_    = Compile.Of_simplified.compile (Contract entry_point) simplified in
+    let%bind typed,_    = Compile.Utils.type_file source_file syntax (Contract entry_point) in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     let%bind michelson  = Compile.Of_mini_c.aggregate_and_compile_contract mini_c entry_point in
     let%bind contract   = Compile.Of_michelson.build_contract ~disable_typecheck michelson in
@@ -170,10 +167,8 @@ let print_cst =
 let print_ast =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    ok @@ Format.asprintf "%a\n" Compile.Of_simplified.pretty_print simplified
+    let%bind core = Compile.Utils.to_core source_file syntax in
+    ok @@ Format.asprintf "%a\n" Compile.Of_core.pretty_print core
   )
   in
   let term = Term.(const f $ source_file 0 $ syntax $ display_format) in
@@ -184,10 +179,7 @@ let print_ast =
 let print_typed_ast =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
+    let%bind typed,_    = Compile.Utils.type_file source_file syntax Env in
     ok @@ Format.asprintf "%a\n" Compile.Of_typed.pretty_print typed
   )
   in
@@ -199,10 +191,7 @@ let print_typed_ast =
 let print_mini_c =
   let f source_file syntax display_format  = (
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
+    let%bind typed,_    = Compile.Utils.type_file source_file syntax Env in
     let%bind mini_c     = Compile.Of_typed.compile typed in
     ok @@ Format.asprintf "%a\n" Compile.Of_mini_c.pretty_print mini_c
   )
@@ -215,13 +204,7 @@ let print_mini_c =
 let measure_contract =
   let f source_file entry_point syntax display_format  =
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    let%bind typed,_    = Compile.Of_simplified.compile (Contract entry_point) simplified in
-    let%bind mini_c     = Compile.Of_typed.compile typed in
-    let%bind michelson  = Compile.Of_mini_c.aggregate_and_compile_contract mini_c entry_point in
-    let%bind contract   = Compile.Of_michelson.build_contract michelson in
+    let%bind contract   = Compile.Utils.compile_file source_file syntax entry_point in
     let open Tezos_utils in
     ok @@ Format.asprintf "%d bytes\n" (Michelson.measure contract)
   in
@@ -234,10 +217,7 @@ let measure_contract =
 let compile_parameter =
   let f source_file entry_point expression syntax amount balance sender source predecessor_timestamp display_format michelson_format =
     toplevel ~display_format @@
-    let%bind abstracted     = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
+    let%bind typed_prg,state = Compile.Utils.type_file source_file syntax (Contract entry_point) in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
     let%bind michelson_prg   = Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg entry_point in
     let      env             = Ast_typed.program_environment typed_prg in
@@ -245,11 +225,7 @@ let compile_parameter =
       (* fails if the given entry point is not a valid contract *)
       Compile.Of_michelson.build_contract michelson_prg in
 
-    let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax expression in
-    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
-    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
-    let%bind (typed_param,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_param in
+    let%bind (typed_param,_)  = Compile.Utils.type_expression (Some source_file) syntax expression env state in
     let%bind mini_c_param     = Compile.Of_typed.compile_expression typed_param in
     let%bind compiled_param   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c_param in
     let%bind ()               = Compile.Of_typed.assert_equal_contract_type Check_parameter entry_point typed_prg typed_param in
@@ -269,20 +245,13 @@ let interpret =
     toplevel ~display_format @@
     let%bind (decl_list,state,env) = match init_file with
       | Some init_file ->
-        let%bind abstracted      = Compile.Of_source.compile init_file (Syntax_name syntax) in
-        let%bind complex    = Compile.Of_abstracted.compile abstracted in
-        let%bind simplified = Compile.Of_complex.compile complex in
-        let%bind typed_prg,state = Compile.Of_simplified.compile Env simplified in
+        let%bind typed_prg,state = Compile.Utils.type_file init_file syntax Env in
         let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
         let      env             = Ast_typed.program_environment typed_prg in
         ok (mini_c_prg,state,env)
       | None -> ok ([],Typer.Solver.initial_state,Ast_typed.Environment.full_empty) in
 
-    let%bind v_syntax       = Helpers.syntax_to_variant (Syntax_name syntax) init_file in
-    let%bind abstracted_exp = Compile.Of_source.compile_expression v_syntax expression in
-    let%bind complex_exp    = Compile.Of_abstracted.compile_expression abstracted_exp in
-    let%bind simplified_exp = Compile.Of_complex.compile_expression complex_exp in
-    let%bind (typed_exp,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_exp in
+    let%bind (typed_exp,_)  = Compile.Utils.type_expression init_file syntax expression env state in
     let%bind mini_c_exp     = Compile.Of_typed.compile_expression typed_exp in
     let%bind compiled_exp   = Compile.Of_mini_c.aggregate_and_compile_expression decl_list mini_c_exp in
     let%bind options        = Run.make_dry_run_options {predecessor_timestamp ; amount ; balance ; sender ; source } in
@@ -292,8 +261,8 @@ let interpret =
         let%bind failstring = Run.failwith_to_string fail_res in
         ok @@ Format.asprintf "%s" failstring
       | Success value' ->
-        let%bind simplified_output = Uncompile.uncompile_expression typed_exp.type_expression value' in
-        ok @@ Format.asprintf "%a\n" Ast_simplified.PP.expression simplified_output
+        let%bind core_output = Uncompile.uncompile_expression typed_exp.type_expression value' in
+        ok @@ Format.asprintf "%a\n" Ast_core.PP.expression core_output
   in
   let term =
     Term.(const f $ expression "EXPRESSION" 0 $ init_file $ syntax $ amount $ balance $ sender $ source $ predecessor_timestamp $ display_format ) in
@@ -304,10 +273,7 @@ let interpret =
 let temp_ligo_interpreter =
   let f source_file syntax display_format =
     toplevel ~display_format @@
-    let%bind abstracted = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex    = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified = Compile.Of_complex.compile complex in
-    let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
+    let%bind typed,_    = Compile.Utils.type_file source_file syntax Env in
     let%bind res = Compile.Of_typed.some_interpret typed in
     ok @@ Format.asprintf "%s\n" res
   in
@@ -320,10 +286,7 @@ let temp_ligo_interpreter =
 let compile_storage =
   let f source_file entry_point expression syntax amount balance sender source predecessor_timestamp display_format michelson_format =
     toplevel ~display_format @@
-    let%bind abstracted      = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex         = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified      = Compile.Of_complex.compile complex in
-    let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
+    let%bind typed_prg,state = Compile.Utils.type_file source_file syntax (Contract entry_point) in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
     let%bind michelson_prg   = Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg entry_point in
     let      env             = Ast_typed.program_environment typed_prg in
@@ -331,11 +294,7 @@ let compile_storage =
       (* fails if the given entry point is not a valid contract *)
       Compile.Of_michelson.build_contract michelson_prg in
 
-    let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax expression in
-    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
-    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
-    let%bind (typed_param,_)  = Compile.Of_simplified.compile_expression ~env ~state simplified_param in
+    let%bind (typed_param,_)  = Compile.Utils.type_expression (Some source_file) syntax expression env state in
     let%bind mini_c_param     = Compile.Of_typed.compile_expression typed_param in
     let%bind compiled_param   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c_param in
     let%bind ()               = Compile.Of_typed.assert_equal_contract_type Check_storage entry_point typed_prg typed_param in
@@ -353,10 +312,7 @@ let compile_storage =
 let dry_run =
   let f source_file entry_point storage input amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
-    let%bind abstracted      = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex         = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified      = Compile.Of_complex.compile complex in
-    let%bind typed_prg,state = Compile.Of_simplified.compile (Contract entry_point) simplified in
+    let%bind typed_prg,state = Compile.Utils.type_file source_file syntax (Contract entry_point) in
     let      env             = Ast_typed.program_environment typed_prg in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
     let%bind michelson_prg   = Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg entry_point in
@@ -364,13 +320,7 @@ let dry_run =
       (* fails if the given entry point is not a valid contract *)
       Compile.Of_michelson.build_contract michelson_prg in
 
-    let%bind v_syntax          = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind abstracted        = Compile.Of_source.compile_contract_input storage input v_syntax in
-    let%bind complex           = Compile.Of_abstracted.compile_expression abstracted in
-    let%bind simplified        = Compile.Of_complex.compile_expression complex in
-    let%bind typed,_           = Compile.Of_simplified.compile_expression ~env ~state simplified in
-    let%bind mini_c            = Compile.Of_typed.compile_expression typed in
-    let%bind compiled_params   = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c in
+    let%bind compiled_params   = Compile.Utils.compile_storage storage input source_file syntax env state mini_c_prg in
     let%bind args_michelson    = Run.evaluate_expression compiled_params.expr compiled_params.expr_ty in
 
     let%bind options           = Run.make_dry_run_options {predecessor_timestamp ; amount ; balance ; sender ; source } in
@@ -380,8 +330,8 @@ let dry_run =
         let%bind failstring = Run.failwith_to_string fail_res in
         ok @@ Format.asprintf "%s" failstring
       | Success michelson_output ->
-        let%bind simplified_output = Uncompile.uncompile_typed_program_entry_function_result typed_prg entry_point michelson_output in
-        ok @@ Format.asprintf "%a\n" Ast_simplified.PP.expression simplified_output
+        let%bind core_output = Uncompile.uncompile_typed_program_entry_function_result typed_prg entry_point michelson_output in
+        ok @@ Format.asprintf "%a\n" Ast_core.PP.expression core_output
   in
   let term =
     Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ expression "STORAGE" 3 $ amount $ balance $ sender $ source $ predecessor_timestamp $ syntax $ display_format) in
@@ -392,20 +342,17 @@ let dry_run =
 let run_function =
   let f source_file entry_point parameter amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
-    let%bind v_syntax        = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
-    let%bind abstracted_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex_prg     = Compile.Of_abstracted.compile abstracted_prg in
-    let%bind simplified_prg  = Compile.Of_complex.compile complex_prg in
-    let%bind typed_prg,state = Compile.Of_simplified.compile Env simplified_prg in
+    let%bind typed_prg,state = Compile.Utils.type_file source_file syntax Env in
     let      env             = Ast_typed.program_environment typed_prg in
     let%bind mini_c_prg      = Compile.Of_typed.compile typed_prg in
 
 
-    let%bind abstracted_param = Compile.Of_source.compile_expression v_syntax parameter in
-    let%bind complex_param    = Compile.Of_abstracted.compile_expression abstracted_param in
-    let%bind simplified_param = Compile.Of_complex.compile_expression complex_param in
-    let%bind app              = Compile.Of_simplified.apply entry_point simplified_param in
-    let%bind (typed_app,_)    = Compile.Of_simplified.compile_expression ~env ~state app in
+    let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
+    let%bind imperative_param = Compile.Of_source.compile_expression v_syntax parameter in
+    let%bind sugar_param      = Compile.Of_imperative.compile_expression imperative_param in
+    let%bind core_param       = Compile.Of_sugar.compile_expression sugar_param in
+    let%bind app              = Compile.Of_core.apply entry_point core_param in
+    let%bind (typed_app,_)    = Compile.Of_core.compile_expression ~env ~state app in
     let%bind compiled_applied = Compile.Of_typed.compile_expression typed_app in
 
     let%bind michelson        = Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg compiled_applied in
@@ -417,7 +364,7 @@ let run_function =
         ok @@ Format.asprintf "%s" failstring
       | Success michelson_output ->
         let%bind simplified_output = Uncompile.uncompile_typed_program_entry_function_result typed_prg entry_point michelson_output in
-        ok @@ Format.asprintf "%a\n" Ast_simplified.PP.expression simplified_output
+        ok @@ Format.asprintf "%a\n" Ast_core.PP.expression simplified_output
   in
   let term =
     Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ amount $ balance $ sender $ source $ predecessor_timestamp $ syntax $ display_format) in
@@ -428,17 +375,14 @@ let run_function =
 let evaluate_value =
   let f source_file entry_point amount balance sender source predecessor_timestamp syntax display_format =
     toplevel ~display_format @@
-    let%bind abstracted        = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex           = Compile.Of_abstracted.compile abstracted in
-    let%bind simplified        = Compile.Of_complex.compile complex in
-    let%bind typed_prg,_       = Compile.Of_simplified.compile Env simplified in
+    let%bind typed_prg,_       = Compile.Utils.type_file source_file syntax Env in
     let%bind mini_c            = Compile.Of_typed.compile typed_prg in
     let%bind (exp,_)           = Mini_c.get_entry mini_c entry_point in
     let%bind compiled          = Compile.Of_mini_c.aggregate_and_compile_expression mini_c exp in
     let%bind options           = Run.make_dry_run_options {predecessor_timestamp ; amount ; balance ; sender ; source } in
     let%bind michelson_output  = Run.run_no_failwith ~options compiled.expr compiled.expr_ty in
     let%bind simplified_output = Uncompile.uncompile_typed_program_entry_expression_result typed_prg entry_point michelson_output in
-    ok @@ Format.asprintf "%a\n" Ast_simplified.PP.expression simplified_output
+    ok @@ Format.asprintf "%a\n" Ast_core.PP.expression simplified_output
   in
   let term =
     Term.(const f $ source_file 0 $ entry_point 1 $ amount $ balance $ sender $ source $ predecessor_timestamp $ syntax $ display_format) in
@@ -449,15 +393,9 @@ let evaluate_value =
 let compile_expression =
   let f expression syntax display_format michelson_format =
     toplevel ~display_format @@
-    let%bind v_syntax = Helpers.syntax_to_variant (Syntax_name syntax) (None) in
     let      env      = Ast_typed.Environment.full_empty in
     let      state    = Typer.Solver.initial_state in
-    let%bind abstracted    = Compile.Of_source.compile_expression v_syntax expression in
-    let%bind complex       = Compile.Of_abstracted.compile_expression abstracted in
-    let%bind simplified    = Compile.Of_complex.compile_expression complex in
-    let%bind (typed_exp,_) = Compile.Of_simplified.compile_expression ~env ~state simplified in
-    let%bind mini_c_exp    = Compile.Of_typed.compile_expression typed_exp in
-    let%bind compiled_exp  = Compile.Of_mini_c.compile_expression mini_c_exp in
+    let%bind compiled_exp  = Compile.Utils.compile_expression None syntax expression env state in
     let%bind value         = Run.evaluate_expression compiled_exp.expr compiled_exp.expr_ty in
     ok @@ Format.asprintf "%a\n" (Main.Display.michelson_pp michelson_format) value
   in
@@ -478,10 +416,8 @@ let dump_changelog =
 let list_declarations =
   let f source_file syntax =
     toplevel ~display_format:(`Human_readable) @@
-    let%bind abstracted_prg  = Compile.Of_source.compile source_file (Syntax_name syntax) in
-    let%bind complex_prg     = Compile.Of_abstracted.compile abstracted_prg in
-    let%bind simplified_prg  = Compile.Of_complex.compile complex_prg in
-    let json_decl = List.map (fun decl -> `String decl) @@ Compile.Of_simplified.list_declarations simplified_prg in
+    let%bind core_prg  = Compile.Utils.to_core source_file syntax in
+    let json_decl = List.map (fun decl -> `String decl) @@ Compile.Of_core.list_declarations core_prg in
     ok @@ J.to_string @@ `Assoc [ ("source_file", `String source_file) ; ("declarations", `List json_decl) ]
   in
   let term =
diff --git a/src/main/compile/dune b/src/main/compile/dune
index 514fa22f5..323200979 100644
--- a/src/main/compile/dune
+++ b/src/main/compile/dune
@@ -9,11 +9,11 @@
     ast_imperative
     self_ast_imperative
     instruction_remover
-    ast_complex
-    self_ast_complex
+    ast_sugar
+    self_ast_sugar
     simplifier
-    ast_simplified
-    self_ast_simplified
+    ast_core
+    self_ast_core
     typer_new
     typer
     ast_typed
diff --git a/src/main/compile/helpers.ml b/src/main/compile/helpers.ml
index d4809c9eb..4fabbd0fa 100644
--- a/src/main/compile/helpers.ml
+++ b/src/main/compile/helpers.ml
@@ -23,55 +23,55 @@ let parsify_pascaligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Pascaligo.parse_file source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
       Abstracter.Pascaligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_expression_pascaligo source =
   let%bind raw =
     trace (simple_error "parsing expression") @@
     Parser.Pascaligo.parse_expression source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting expression") @@
     Abstracter.Pascaligo.abstr_expression raw
-  in ok simplified
+  in ok imperative
 
 let parsify_cameligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Cameligo.parse_file source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
     Abstracter.Cameligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_expression_cameligo source =
   let%bind raw =
     trace (simple_error "parsing expression") @@
     Parser.Cameligo.parse_expression source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting expression") @@
     Abstracter.Cameligo.abstr_expression raw
-  in ok simplified
+  in ok imperative
 
 let parsify_reasonligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Reasonligo.parse_file source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
     Abstracter.Cameligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_expression_reasonligo source =
   let%bind raw =
     trace (simple_error "parsing expression") @@
     Parser.Reasonligo.parse_expression source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting expression") @@
     Abstracter.Cameligo.abstr_expression raw
-  in ok simplified
+  in ok imperative
 
 let parsify syntax source =
   let%bind parsify =
@@ -96,28 +96,28 @@ let parsify_string_reasonligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Reasonligo.parse_string source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
     Abstracter.Cameligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_string_pascaligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Pascaligo.parse_string source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
     Abstracter.Pascaligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_string_cameligo source =
   let%bind raw =
     trace (simple_error "parsing") @@
     Parser.Cameligo.parse_string source in
-  let%bind simplified =
+  let%bind imperative =
     trace (simple_error "abstracting") @@
     Abstracter.Cameligo.abstr_program raw
-  in ok simplified
+  in ok imperative
 
 let parsify_string syntax source =
   let%bind parsify =
diff --git a/src/main/compile/of_simplified.ml b/src/main/compile/of_core.ml
similarity index 59%
rename from src/main/compile/of_simplified.ml
rename to src/main/compile/of_core.ml
index 01e3a4562..c6c48c299 100644
--- a/src/main/compile/of_simplified.ml
+++ b/src/main/compile/of_core.ml
@@ -4,7 +4,7 @@ type form =
   | Contract of string
   | Env
 
-let compile (cform: form) (program : Ast_simplified.program) : (Ast_typed.program * Typer.Solver.state) result =
+let compile (cform: form) (program : Ast_core.program) : (Ast_typed.program * Typer.Solver.state) result =
   let%bind (prog_typed , state) = Typer.type_program program in
   let () = Typer.Solver.discard_state state in
   let%bind applied = Self_ast_typed.all_program prog_typed in
@@ -13,31 +13,31 @@ let compile (cform: form) (program : Ast_simplified.program) : (Ast_typed.progra
     | Env -> ok applied in
   ok @@ (applied', state)
 
-let compile_expression ?(env = Ast_typed.Environment.full_empty) ~(state : Typer.Solver.state) (e : Ast_simplified.expression)
+let compile_expression ?(env = Ast_typed.Environment.full_empty) ~(state : Typer.Solver.state) (e : Ast_core.expression)
     : (Ast_typed.expression * Typer.Solver.state) result =
   let%bind (ae_typed,state) = Typer.type_expression_subst env state e in
   let () = Typer.Solver.discard_state state in
   let%bind ae_typed' = Self_ast_typed.all_expression ae_typed in
   ok @@ (ae_typed',state)
 
-let apply (entry_point : string) (param : Ast_simplified.expression) : Ast_simplified.expression result =
+let apply (entry_point : string) (param : Ast_core.expression) : Ast_core.expression result =
   let name = Var.of_name entry_point in
-  let entry_point_var : Ast_simplified.expression =
-    { expression_content = Ast_simplified.E_variable name ;
+  let entry_point_var : Ast_core.expression =
+    { expression_content = Ast_core.E_variable name ;
       location = Virtual "generated entry-point variable" } in
-  let applied : Ast_simplified.expression = 
-    { expression_content = Ast_simplified.E_application {expr1=entry_point_var; expr2=param} ;
+  let applied : Ast_core.expression = 
+    { expression_content = Ast_core.E_application {expr1=entry_point_var; expr2=param} ;
       location = Virtual "generated application" } in
   ok applied
 
-let pretty_print formatter (program : Ast_simplified.program) = 
-  Ast_simplified.PP.program formatter program
+let pretty_print formatter (program : Ast_core.program) = 
+  Ast_core.PP.program formatter program
 
-let list_declarations (program : Ast_simplified.program) : string list =
+let list_declarations (program : Ast_core.program) : string list =
   List.fold_left
     (fun prev el -> 
       let open Location in
-      let open Ast_simplified in
+      let open Ast_core in
       match el.wrap_content with
       | Declaration_constant (var,_,_,_) -> (Var.to_name var)::prev
       | _ -> prev) 
diff --git a/src/main/compile/of_abstracted.ml b/src/main/compile/of_imperative.ml
similarity index 79%
rename from src/main/compile/of_abstracted.ml
rename to src/main/compile/of_imperative.ml
index b56b1991d..cc84ff4d7 100644
--- a/src/main/compile/of_abstracted.ml
+++ b/src/main/compile/of_imperative.ml
@@ -6,10 +6,10 @@ type form =
   | Contract of string
   | Env
 
-let compile (program : program) : Ast_complex.program result =
+let compile (program : program) : Ast_sugar.program result =
   remove_instruction_in_program program
 
-let compile_expression (e : expression) : Ast_complex.expression result =
+let compile_expression (e : expression) : Ast_sugar.expression result =
   remove_instruction_in_expression e
 
 let pretty_print formatter (program : program) = 
diff --git a/src/main/compile/of_complex.ml b/src/main/compile/of_sugar.ml
similarity index 74%
rename from src/main/compile/of_complex.ml
rename to src/main/compile/of_sugar.ml
index 390737bbd..9073bf615 100644
--- a/src/main/compile/of_complex.ml
+++ b/src/main/compile/of_sugar.ml
@@ -1,15 +1,15 @@
 open Trace
-open Ast_complex
+open Ast_sugar
 open Simplifier
 
 type form = 
   | Contract of string
   | Env
 
-let compile (program : program) : Ast_simplified.program result =
+let compile (program : program) : Ast_core.program result =
   simplify_program program
 
-let compile_expression (e : expression) : Ast_simplified.expression result =
+let compile_expression (e : expression) : Ast_core.expression result =
   simplify_expression e
 
 let pretty_print formatter (program : program) = 
diff --git a/src/main/compile/utils.ml b/src/main/compile/utils.ml
new file mode 100644
index 000000000..ab8ac6503
--- /dev/null
+++ b/src/main/compile/utils.ml
@@ -0,0 +1,65 @@
+open Trace 
+
+let to_imperatve f stx =
+  let%bind imperative  = Of_source.compile f (Syntax_name stx) in
+  ok @@ imperative
+
+let to_sugar f stx = 
+  let%bind imperative = to_imperatve f stx in 
+  let%bind sugar      = Of_imperative.compile imperative in
+  ok @@ sugar
+
+let to_core f stx = 
+  let%bind sugar  = to_sugar f stx in
+  let%bind core   = Of_sugar.compile sugar in
+  ok @@ core
+
+let type_file f stx env =
+  let%bind core        = to_core f stx in
+  let%bind typed,state = Of_core.compile env core in
+  ok @@ (typed,state)
+
+let to_mini_c f stx env =
+  let%bind typed, _ = type_file f stx env in
+  let%bind mini_c     = Of_typed.compile typed in
+  ok @@ mini_c
+
+let compile_file f stx ep =
+  let%bind typed, _ = type_file f stx @@ Contract ep in
+  let%bind mini_c     = Of_typed.compile typed in
+  let%bind michelson  = Of_mini_c.aggregate_and_compile_contract mini_c ep in
+  let%bind contract   = Of_michelson.build_contract michelson in
+  ok @@ contract
+
+let type_expression source_file syntax expression env state =
+    let%bind v_syntax         = Helpers.syntax_to_variant (Syntax_name syntax) source_file in
+    let%bind imperative_exp    = Of_source.compile_expression v_syntax expression in
+    let%bind sugar_exp         = Of_imperative.compile_expression imperative_exp in
+    let%bind core_exp          = Of_sugar.compile_expression sugar_exp in
+    let%bind (typed_exp,state) = Of_core.compile_expression ~env ~state core_exp in
+    ok @@ (typed_exp,state)
+
+let expression_to_mini_c source_file syntax expression env state =
+    let%bind (typed_exp,_)  = type_expression source_file syntax expression env state in
+    let%bind mini_c_exp     = Of_typed.compile_expression typed_exp in
+    ok @@ mini_c_exp
+
+let compile_expression source_file syntax expression env state =
+    let%bind mini_c_exp = expression_to_mini_c source_file syntax expression env state in
+    let%bind compiled   = Of_mini_c.compile_expression mini_c_exp in
+    ok @@ compiled
+
+let compile_and_aggregate_expression source_file syntax expression env state mini_c_prg =
+    let%bind mini_c_exp = expression_to_mini_c source_file syntax expression env state in
+    let%bind compiled   = Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c_exp in
+    ok @@ compiled
+
+let compile_storage storage input source_file syntax env state mini_c_prg =
+    let%bind v_syntax   = Helpers.syntax_to_variant (Syntax_name syntax) (Some source_file) in
+    let%bind imperative = Of_source.compile_contract_input storage input v_syntax in
+    let%bind sugar      = Of_imperative.compile_expression imperative in
+    let%bind core       = Of_sugar.compile_expression sugar in
+    let%bind typed,_    = Of_core.compile_expression ~env ~state core in
+    let%bind mini_c     = Of_typed.compile_expression typed in
+    let%bind compiled   = Of_mini_c.aggregate_and_compile_expression mini_c_prg mini_c in
+    ok @@ compiled
diff --git a/src/main/run/dune b/src/main/run/dune
index ad6ef9cc5..55644e553 100644
--- a/src/main/run/dune
+++ b/src/main/run/dune
@@ -8,7 +8,7 @@
     abstracter
     self_ast_imperative
     simplifier
-    ast_simplified
+    ast_core
     typer_new
     typer
     ast_typed
diff --git a/src/passes/2-abstracter/camligo.ml.old b/src/passes/2-abstracter/camligo.ml.old
index deb987624..7789d796d 100644
--- a/src/passes/2-abstracter/camligo.ml.old
+++ b/src/passes/2-abstracter/camligo.ml.old
@@ -1,7 +1,7 @@
 open Trace
 open Function
 module I = Parser.Cameligo.Ast
-module O = Ast_simplified
+module O = Ast_core
 open O.Combinators
 
 let unwrap : type a . a Location.wrap -> a = Location.unwrap
diff --git a/src/passes/2-abstracter/pascaligo.mli b/src/passes/2-abstracter/pascaligo.mli
index 652c77d99..ec68d93c9 100644
--- a/src/passes/2-abstracter/pascaligo.mli
+++ b/src/passes/2-abstracter/pascaligo.mli
@@ -6,10 +6,10 @@ open Ast_imperative
 module Raw = Parser.Pascaligo.AST
 module SMap = Map.String
 
-(** Convert a concrete PascaLIGO expression AST to the simplified
+(** Convert a concrete PascaLIGO expression AST to the imperative
     expression AST used by the compiler. *)
 val abstr_expression : Raw.expr -> expr result
 
-(** Convert a concrete PascaLIGO program AST to the simplified program
+(** Convert a concrete PascaLIGO program AST to the miperative program
     AST used by the compiler. *)
 val abstr_program : Raw.ast -> program result
diff --git a/src/passes/4-Instruction_remover/dune b/src/passes/4-Instruction_remover/dune
index eb702bf26..8b3b3e071 100644
--- a/src/passes/4-Instruction_remover/dune
+++ b/src/passes/4-Instruction_remover/dune
@@ -4,7 +4,7 @@
   (libraries
     simple-utils
     ast_imperative
-    ast_complex
+    ast_sugar
     proto-alpha-utils
   )
   (preprocess
diff --git a/src/passes/4-Instruction_remover/instruction_remover.ml b/src/passes/4-Instruction_remover/instruction_remover.ml
index 816ed47b9..7943419c2 100644
--- a/src/passes/4-Instruction_remover/instruction_remover.ml
+++ b/src/passes/4-Instruction_remover/instruction_remover.ml
@@ -1,5 +1,5 @@
 module I = Ast_imperative
-module O = Ast_complex
+module O = Ast_sugar
 open Trace
 
 let rec idle_type_expression : I.type_expression -> O.type_expression result =
diff --git a/src/passes/5-self_ast_complex/dune b/src/passes/5-self_ast_complex/dune
index 819a5ad1f..33b51be08 100644
--- a/src/passes/5-self_ast_complex/dune
+++ b/src/passes/5-self_ast_complex/dune
@@ -1,9 +1,9 @@
 (library
-  (name self_ast_complex)
-  (public_name ligo.self_ast_complex)
+  (name self_ast_sugar)
+  (public_name ligo.self_ast_sugar)
   (libraries
     simple-utils
-    ast_complex
+    ast_sugar
     proto-alpha-utils
   )
   (preprocess
diff --git a/src/passes/6-simplifier/dune b/src/passes/6-simplifier/dune
index a693dcd19..78556f444 100644
--- a/src/passes/6-simplifier/dune
+++ b/src/passes/6-simplifier/dune
@@ -3,8 +3,8 @@
   (public_name ligo.simplifier)
   (libraries
     simple-utils
-    ast_complex
-    ast_simplified
+    ast_sugar
+    ast_core
     proto-alpha-utils
   )
   (preprocess
diff --git a/src/passes/6-simplifier/simplifier.ml b/src/passes/6-simplifier/simplifier.ml
index fd396705e..3b70281ee 100644
--- a/src/passes/6-simplifier/simplifier.ml
+++ b/src/passes/6-simplifier/simplifier.ml
@@ -1,5 +1,5 @@
-module I = Ast_complex
-module O = Ast_simplified
+module I = Ast_sugar
+module O = Ast_core
 open Trace
 
 let rec idle_type_expression : I.type_expression -> O.type_expression result =
diff --git a/src/passes/7-self_ast_simplified/dune b/src/passes/7-self_ast_simplified/dune
index aef575249..e51afd86e 100644
--- a/src/passes/7-self_ast_simplified/dune
+++ b/src/passes/7-self_ast_simplified/dune
@@ -1,9 +1,9 @@
 (library
-  (name self_ast_simplified)
-  (public_name ligo.self_ast_simplified)
+  (name self_ast_core)
+  (public_name ligo.self_ast_core)
   (libraries
     simple-utils
-    ast_simplified
+    ast_core
     proto-alpha-utils
   )
   (preprocess
diff --git a/src/passes/8-typer-new/dune b/src/passes/8-typer-new/dune
index 645a7053f..b7bbee5f4 100644
--- a/src/passes/8-typer-new/dune
+++ b/src/passes/8-typer-new/dune
@@ -4,7 +4,7 @@
   (libraries
     simple-utils
     tezos-utils
-    ast_simplified
+    ast_core
     ast_typed
     operators
     UnionFind
diff --git a/src/passes/8-typer-new/solver.ml b/src/passes/8-typer-new/solver.ml
index aad418cb5..328cfe015 100644
--- a/src/passes/8-typer-new/solver.ml
+++ b/src/passes/8-typer-new/solver.ml
@@ -3,7 +3,7 @@ open Trace
 module Core = Typesystem.Core
 
 module Wrap = struct
-  module I = Ast_simplified
+  module I = Ast_core
   module T = Ast_typed
   module O = Core
 
diff --git a/src/passes/8-typer-new/typer.ml b/src/passes/8-typer-new/typer.ml
index a796d0ede..555ec8ae8 100644
--- a/src/passes/8-typer-new/typer.ml
+++ b/src/passes/8-typer-new/typer.ml
@@ -1,6 +1,6 @@
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 open O.Combinators
 
@@ -872,7 +872,7 @@ let untype_type_value (t:O.type_expression) : (I.type_expression) result =
 (* TODO: we ended up with two versions of type_program… ??? *)
 
 (*
-Apply type_declaration on all the node of the AST_simplified from the root p
+Apply type_declaration on all the node of the AST_core from the root p
 *)
 let type_program_returns_state ((env, state, p) : environment * Solver.state * I.program) : (environment * Solver.state * O.program) result =
   let aux ((e : environment), (s : Solver.state) , (ds : O.declaration Location.wrap list)) (d:I.declaration Location.wrap) =
@@ -950,10 +950,10 @@ let type_program' : I.program -> O.program result = fun p ->
   ok p'
 
 (*
-  Tranform a Ast_typed type_expression into an ast_simplified type_expression
+  Tranform a Ast_typed type_expression into an ast_core type_expression
 *)
 let rec untype_type_expression (t:O.type_expression) : (I.type_expression) result =
-  (* TODO: or should we use t.simplified if present? *)
+  (* TODO: or should we use t.core if present? *)
   let%bind t = match t.type_content with
   | O.T_sum x ->
     let%bind x' = Stage_common.Helpers.bind_map_cmap untype_type_expression x in
@@ -999,13 +999,13 @@ let rec untype_type_expression (t:O.type_expression) : (I.type_expression) resul
     in
   ok @@ I.make_t t
 
-(* match t.simplified with *)
+(* match t.core with *)
 (* | Some s -> ok s *)
 (* | _ -> fail @@ internal_assertion_failure "trying to untype generated type" *)
 
 
 (*
-  Tranform a Ast_typed literal into an ast_simplified literal
+  Tranform a Ast_typed literal into an ast_core literal
 *)
 let untype_literal (l:O.literal) : I.literal result =
   let open I in
@@ -1027,7 +1027,7 @@ let untype_literal (l:O.literal) : I.literal result =
   | Literal_operation s -> ok (Literal_operation s)
 
 (*
-  Tranform a Ast_typed expression into an ast_simplified matching
+  Tranform a Ast_typed expression into an ast_core matching
 *)
 let rec untype_expression (e:O.expression) : (I.expression) result =
   let open I in
@@ -1107,7 +1107,7 @@ and untype_lambda ty {binder; result} : I.lambda result =
       ok ({binder;input_type = Some input_type; output_type = Some output_type; result}: I.lambda)
 
 (*
-  Tranform a Ast_typed matching into an ast_simplified matching
+  Tranform a Ast_typed matching into an ast_core matching
 *)
 and untype_matching : (O.expression -> I.expression result) -> O.matching_expr -> I.matching_expr result = fun f m ->
   let open I in
diff --git a/src/passes/8-typer-new/typer.ml.old b/src/passes/8-typer-new/typer.ml.old
index db842716a..66b918235 100644
--- a/src/passes/8-typer-new/typer.ml.old
+++ b/src/passes/8-typer-new/typer.ml.old
@@ -1,6 +1,6 @@
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 open O.Combinators
 
@@ -736,7 +736,7 @@ and type_constant (name:string) (lst:O.type_expression list) (tv_opt:O.type_expr
   typer lst tv_opt
 
 let untype_type_expression (t:O.type_expression) : (I.type_expression) result =
-  match t.simplified with
+  match t.core with
   | Some s -> ok s
   | _ -> fail @@ internal_assertion_failure "trying to untype generated type"
 
diff --git a/src/passes/8-typer-new/typer.mli b/src/passes/8-typer-new/typer.mli
index 29b7cad08..6e24e7359 100644
--- a/src/passes/8-typer-new/typer.mli
+++ b/src/passes/8-typer-new/typer.mli
@@ -1,6 +1,6 @@
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 
 module Environment = O.Environment
diff --git a/src/passes/8-typer-old/dune b/src/passes/8-typer-old/dune
index 29e48c79e..faec4e901 100644
--- a/src/passes/8-typer-old/dune
+++ b/src/passes/8-typer-old/dune
@@ -4,7 +4,7 @@
   (libraries
     simple-utils
     tezos-utils
-    ast_simplified
+    ast_core
     ast_typed
     typer_new
     operators
diff --git a/src/passes/8-typer-old/typer.ml b/src/passes/8-typer-old/typer.ml
index e1cf018e2..52586508d 100644
--- a/src/passes/8-typer-old/typer.ml
+++ b/src/passes/8-typer-old/typer.ml
@@ -1,6 +1,6 @@
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 open O.Combinators
 
diff --git a/src/passes/8-typer-old/typer.mli b/src/passes/8-typer-old/typer.mli
index 9b1e986da..d1bf21393 100644
--- a/src/passes/8-typer-old/typer.mli
+++ b/src/passes/8-typer-old/typer.mli
@@ -1,6 +1,6 @@
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 
 module Environment = O.Environment
diff --git a/src/passes/8-typer/dune b/src/passes/8-typer/dune
index 35c5e807d..f6072da39 100644
--- a/src/passes/8-typer/dune
+++ b/src/passes/8-typer/dune
@@ -4,7 +4,7 @@
   (libraries
     simple-utils
     tezos-utils
-    ast_simplified
+    ast_core
     ast_typed
     typer_old
     typer_new
diff --git a/src/passes/8-typer/typer.ml b/src/passes/8-typer/typer.ml
index 8ab5576a0..48f1ac011 100644
--- a/src/passes/8-typer/typer.ml
+++ b/src/passes/8-typer/typer.ml
@@ -1,6 +1,6 @@
 let use_new_typer = false
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 
 module Environment = O.Environment
diff --git a/src/passes/8-typer/typer.mli b/src/passes/8-typer/typer.mli
index bb8ac3094..bf4c11f4d 100644
--- a/src/passes/8-typer/typer.mli
+++ b/src/passes/8-typer/typer.mli
@@ -2,7 +2,7 @@ val use_new_typer : bool
 
 open Trace
 
-module I = Ast_simplified
+module I = Ast_core
 module O = Ast_typed
 
 module Environment = O.Environment
diff --git a/src/passes/operators/dune b/src/passes/operators/dune
index 4eb539830..fa69f6257 100644
--- a/src/passes/operators/dune
+++ b/src/passes/operators/dune
@@ -5,8 +5,8 @@
     simple-utils
     tezos-utils
     ast_imperative
-    ast_complex
-    ast_simplified
+    ast_sugar
+    ast_core
     ast_typed
     typesystem
     mini_c
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index abd16ae55..cf6f04e5c 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -17,7 +17,7 @@ module Abstracter = struct
 
     Constants are special names that have their own case in the AST. E_constant
     for regular constants, and T_constant for type constants. Both types are
-    defined in `Ast_simplified/types.ml`.
+    defined in `Ast_core/types.ml`.
     For instance, "2 + 2" in Pascaligo is translated to `E_constant ("ADD" , [
       E_literal (Literal_int 2) ;
       E_literal (Literal_int 2) ;
diff --git a/src/stages/1-ast_imperative/combinators.ml b/src/stages/1-ast_imperative/combinators.ml
index a37a1b7ef..ceacdcc4e 100644
--- a/src/stages/1-ast_imperative/combinators.ml
+++ b/src/stages/1-ast_imperative/combinators.ml
@@ -237,7 +237,7 @@ let tuple_of_record (m: _ LMap.t) =
 let get_e_tuple = fun t ->
   match t with
   | E_record r -> ok @@ tuple_of_record r
-  | _ -> simple_fail "ast_simplified: get_e_tuple: not a tuple"
+  | _ -> simple_fail "ast_core: get_e_tuple: not a tuple"
 
 (* Same as get_e_pair *)
 let extract_pair : expression -> (expression * expression) result = fun e ->
diff --git a/src/stages/1-ast_imperative/types.ml b/src/stages/1-ast_imperative/types.ml
index 75d17207f..6d64cafd1 100644
--- a/src/stages/1-ast_imperative/types.ml
+++ b/src/stages/1-ast_imperative/types.ml
@@ -8,7 +8,7 @@ end
 
 include Stage_common.Types
 
-(*include Ast_generic_type(Ast_simplified_parameter)
+(*include Ast_generic_type(Ast_core_parameter)
 *)
 include Ast_generic_type (Ast_imperative_parameter)
 
diff --git a/src/stages/2-ast_complex/PP.ml b/src/stages/2-ast_sugar/PP.ml
similarity index 99%
rename from src/stages/2-ast_complex/PP.ml
rename to src/stages/2-ast_sugar/PP.ml
index d6e949751..c1288c6f3 100644
--- a/src/stages/2-ast_complex/PP.ml
+++ b/src/stages/2-ast_sugar/PP.ml
@@ -4,7 +4,7 @@ open Format
 open PP_helpers
 
 include Stage_common.PP
-include Ast_PP_type(Ast_complex_parameter)
+include Ast_PP_type(Ast_sugar_parameter)
 
 let expression_variable ppf (ev : expression_variable) : unit =
   fprintf ppf "%a" Var.pp ev
diff --git a/src/stages/2-ast_complex/ast_complex.ml b/src/stages/2-ast_sugar/ast_sugar.ml
similarity index 100%
rename from src/stages/2-ast_complex/ast_complex.ml
rename to src/stages/2-ast_sugar/ast_sugar.ml
diff --git a/src/stages/2-ast_complex/combinators.ml b/src/stages/2-ast_sugar/combinators.ml
similarity index 99%
rename from src/stages/2-ast_complex/combinators.ml
rename to src/stages/2-ast_sugar/combinators.ml
index 9ac673a3c..04a336e93 100644
--- a/src/stages/2-ast_complex/combinators.ml
+++ b/src/stages/2-ast_sugar/combinators.ml
@@ -237,7 +237,7 @@ let tuple_of_record (m: _ LMap.t) =
 let get_e_tuple = fun t ->
   match t with
   | E_record r -> ok @@ tuple_of_record r
-  | _ -> simple_fail "ast_simplified: get_e_tuple: not a tuple"
+  | _ -> simple_fail "ast_core: get_e_tuple: not a tuple"
 
 (* Same as get_e_pair *)
 let extract_pair : expression -> (expression * expression) result = fun e ->
diff --git a/src/stages/2-ast_complex/combinators.mli b/src/stages/2-ast_sugar/combinators.mli
similarity index 100%
rename from src/stages/2-ast_complex/combinators.mli
rename to src/stages/2-ast_sugar/combinators.mli
diff --git a/src/stages/2-ast_complex/dune b/src/stages/2-ast_sugar/dune
similarity index 77%
rename from src/stages/2-ast_complex/dune
rename to src/stages/2-ast_sugar/dune
index 4e1dac4af..6f1ca6fef 100644
--- a/src/stages/2-ast_complex/dune
+++ b/src/stages/2-ast_sugar/dune
@@ -1,6 +1,6 @@
 (library
-  (name ast_complex)
-  (public_name ligo.ast_complex)
+  (name ast_sugar)
+  (public_name ligo.ast_sugar)
   (libraries
     simple-utils
     tezos-utils
diff --git a/src/stages/2-ast_complex/misc.ml b/src/stages/2-ast_sugar/misc.ml
similarity index 100%
rename from src/stages/2-ast_complex/misc.ml
rename to src/stages/2-ast_sugar/misc.ml
diff --git a/src/stages/2-ast_complex/misc.mli b/src/stages/2-ast_sugar/misc.mli
similarity index 100%
rename from src/stages/2-ast_complex/misc.mli
rename to src/stages/2-ast_sugar/misc.mli
diff --git a/src/stages/2-ast_complex/types.ml b/src/stages/2-ast_sugar/types.ml
similarity index 95%
rename from src/stages/2-ast_complex/types.ml
rename to src/stages/2-ast_sugar/types.ml
index 70a348975..dffb887bb 100644
--- a/src/stages/2-ast_complex/types.ml
+++ b/src/stages/2-ast_sugar/types.ml
@@ -2,15 +2,15 @@
 
 module Location = Simple_utils.Location
 
-module Ast_complex_parameter = struct
+module Ast_sugar_parameter = struct
   type type_meta = unit
 end
 
 include Stage_common.Types
 
-(*include Ast_generic_type(Ast_simplified_parameter)
+(*include Ast_generic_type(Ast_core_parameter)
 *)
-include Ast_generic_type (Ast_complex_parameter)
+include Ast_generic_type (Ast_sugar_parameter)
 
 type inline = bool 
 type program = declaration Location.wrap list
diff --git a/src/stages/3-ast_simplified/PP.ml b/src/stages/3-ast_core/PP.ml
similarity index 99%
rename from src/stages/3-ast_simplified/PP.ml
rename to src/stages/3-ast_core/PP.ml
index fa4404307..bd1f13ad5 100644
--- a/src/stages/3-ast_simplified/PP.ml
+++ b/src/stages/3-ast_core/PP.ml
@@ -4,7 +4,7 @@ open Format
 open PP_helpers
 
 include Stage_common.PP
-include Ast_PP_type(Ast_simplified_parameter)
+include Ast_PP_type(Ast_core_parameter)
 
 let expression_variable ppf (ev : expression_variable) : unit =
   fprintf ppf "%a" Var.pp ev
diff --git a/src/stages/3-ast_simplified/ast_simplified.ml b/src/stages/3-ast_core/ast_core.ml
similarity index 100%
rename from src/stages/3-ast_simplified/ast_simplified.ml
rename to src/stages/3-ast_core/ast_core.ml
diff --git a/src/stages/3-ast_simplified/combinators.ml b/src/stages/3-ast_core/combinators.ml
similarity index 99%
rename from src/stages/3-ast_simplified/combinators.ml
rename to src/stages/3-ast_core/combinators.ml
index 2a5e60aff..9ea3f592c 100644
--- a/src/stages/3-ast_simplified/combinators.ml
+++ b/src/stages/3-ast_core/combinators.ml
@@ -237,7 +237,7 @@ let tuple_of_record (m: _ LMap.t) =
 let get_e_tuple = fun t ->
   match t with
   | E_record r -> ok @@ tuple_of_record r
-  | _ -> simple_fail "ast_simplified: get_e_tuple: not a tuple"
+  | _ -> simple_fail "ast_core: get_e_tuple: not a tuple"
 
 (* Same as get_e_pair *)
 let extract_pair : expression -> (expression * expression) result = fun e ->
diff --git a/src/stages/3-ast_simplified/combinators.mli b/src/stages/3-ast_core/combinators.mli
similarity index 100%
rename from src/stages/3-ast_simplified/combinators.mli
rename to src/stages/3-ast_core/combinators.mli
diff --git a/src/stages/3-ast_simplified/dune b/src/stages/3-ast_core/dune
similarity index 75%
rename from src/stages/3-ast_simplified/dune
rename to src/stages/3-ast_core/dune
index f6c961536..ce45b1899 100644
--- a/src/stages/3-ast_simplified/dune
+++ b/src/stages/3-ast_core/dune
@@ -1,6 +1,6 @@
 (library
-  (name ast_simplified)
-  (public_name ligo.ast_simplified)
+  (name ast_core)
+  (public_name ligo.ast_core)
   (libraries
     simple-utils
     tezos-utils
diff --git a/src/stages/3-ast_simplified/misc.ml b/src/stages/3-ast_core/misc.ml
similarity index 100%
rename from src/stages/3-ast_simplified/misc.ml
rename to src/stages/3-ast_core/misc.ml
diff --git a/src/stages/3-ast_simplified/misc.mli b/src/stages/3-ast_core/misc.mli
similarity index 100%
rename from src/stages/3-ast_simplified/misc.mli
rename to src/stages/3-ast_core/misc.mli
diff --git a/src/stages/3-ast_simplified/types.ml b/src/stages/3-ast_core/types.ml
similarity index 95%
rename from src/stages/3-ast_simplified/types.ml
rename to src/stages/3-ast_core/types.ml
index ef2e32f36..07a36d361 100644
--- a/src/stages/3-ast_simplified/types.ml
+++ b/src/stages/3-ast_core/types.ml
@@ -2,15 +2,15 @@
 
 module Location = Simple_utils.Location
 
-module Ast_simplified_parameter = struct
+module Ast_core_parameter = struct
   type type_meta = unit
 end
 
 include Stage_common.Types
 
-(*include Ast_generic_type(Ast_simplified_parameter)
+(*include Ast_generic_type(Ast_core_parameter)
 *)
-include Ast_generic_type (Ast_simplified_parameter)
+include Ast_generic_type (Ast_core_parameter)
 
 type inline = bool 
 type program = declaration Location.wrap list
diff --git a/src/stages/4-ast_typed/combinators.ml b/src/stages/4-ast_typed/combinators.ml
index d6f1e8da5..e9071df97 100644
--- a/src/stages/4-ast_typed/combinators.ml
+++ b/src/stages/4-ast_typed/combinators.ml
@@ -23,7 +23,7 @@ module Errors = struct
     error (thunk "No declaration with the given name") message
 end
 
-let make_t type_content simplified = { type_content ; type_meta=simplified }
+let make_t type_content core = { type_content ; type_meta=core }
 let make_a_e ?(location = Location.generated) expression_content type_expression environment = {
   expression_content ;
   type_expression ;
diff --git a/src/stages/4-ast_typed/dune b/src/stages/4-ast_typed/dune
index 7eed79e47..d33c8dac6 100644
--- a/src/stages/4-ast_typed/dune
+++ b/src/stages/4-ast_typed/dune
@@ -4,7 +4,7 @@
   (libraries
     simple-utils
     tezos-utils
-    ast_simplified ; Is that a good idea?
+    ast_core ; Is that a good idea?
     stage_common
   )
   (preprocess
diff --git a/src/stages/4-ast_typed/types.ml b/src/stages/4-ast_typed/types.ml
index af143aa89..b5a35061f 100644
--- a/src/stages/4-ast_typed/types.ml
+++ b/src/stages/4-ast_typed/types.ml
@@ -1,6 +1,6 @@
 [@@@warning "-30"]
 
-module S = Ast_simplified
+module S = Ast_core
 include Stage_common.Types
 
 module Ast_typed_type_parameter = struct
diff --git a/src/stages/typesystem/misc.ml b/src/stages/typesystem/misc.ml
index 223a94610..dcb46929b 100644
--- a/src/stages/typesystem/misc.ml
+++ b/src/stages/typesystem/misc.ml
@@ -89,24 +89,24 @@ module Substitution = struct
           let _TODO = substs in
           failwith "TODO: T_function"
 
-    and s_abstr_type_content : Ast_simplified.type_content w = fun ~substs -> function
-      | Ast_simplified.T_sum _ -> failwith "TODO: subst: unimplemented case s_type_expression sum"
-      | Ast_simplified.T_record _ -> failwith "TODO: subst: unimplemented case s_type_expression record"
-      | Ast_simplified.T_arrow _ -> failwith "TODO: subst: unimplemented case s_type_expression arrow"
-      | Ast_simplified.T_variable _ -> failwith "TODO: subst: unimplemented case s_type_expression variable"
-      | Ast_simplified.T_operator op ->
+    and s_abstr_type_content : Ast_core.type_content w = fun ~substs -> function
+      | Ast_core.T_sum _ -> failwith "TODO: subst: unimplemented case s_type_expression sum"
+      | Ast_core.T_record _ -> failwith "TODO: subst: unimplemented case s_type_expression record"
+      | Ast_core.T_arrow _ -> failwith "TODO: subst: unimplemented case s_type_expression arrow"
+      | Ast_core.T_variable _ -> failwith "TODO: subst: unimplemented case s_type_expression variable"
+      | Ast_core.T_operator op ->
          let%bind op =
-           Ast_simplified.bind_map_type_operator
+           Ast_core.bind_map_type_operator
              (s_abstr_type_expression ~substs)
              op in
          (* TODO: when we have generalized operators, we might need to subst the operator name itself? *)
-         ok @@ Ast_simplified.T_operator op
-      | Ast_simplified.T_constant constant ->
-         ok @@ Ast_simplified.T_constant constant
+         ok @@ Ast_core.T_operator op
+      | Ast_core.T_constant constant ->
+         ok @@ Ast_core.T_constant constant
 
-    and s_abstr_type_expression : Ast_simplified.type_expression w = fun ~substs {type_content;type_meta} ->
+    and s_abstr_type_expression : Ast_core.type_expression w = fun ~substs {type_content;type_meta} ->
       let%bind type_content = s_abstr_type_content ~substs type_content in
-      ok @@ Ast_simplified.{type_content;type_meta}
+      ok @@ Ast_core.{type_content;type_meta}
 
     and s_type_expression : T.type_expression w = fun ~substs { type_content; type_meta } ->
       let%bind type_content = s_type_content ~substs type_content in
diff --git a/src/test/coase_tests.ml b/src/test/coase_tests.ml
index b773764f9..73520c60e 100644
--- a/src/test/coase_tests.ml
+++ b/src/test/coase_tests.ml
@@ -4,10 +4,7 @@ open Trace
 open Test_helpers
 
 let type_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "pascaligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
@@ -30,7 +27,7 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_simplified
+open Ast_core
 
 let card owner =
   e_record_ez [
@@ -231,7 +228,7 @@ let sell () =
       let expected_storage =
         let cards = List.hds @@ cards_ez first_owner n in
         basic 99 1000 cards (2 * n) in
-      Ast_simplified.Misc.assert_value_eq (expected_storage , storage)
+      Ast_core.Misc.assert_value_eq (expected_storage , storage)
     in
     let%bind () =
       let amount = Memory_proto_alpha.Protocol.Alpha_context.Tez.zero in
diff --git a/src/test/hash_lock_tests.ml b/src/test/hash_lock_tests.ml
index 9ebfe3618..d6bfd7aed 100644
--- a/src/test/hash_lock_tests.ml
+++ b/src/test/hash_lock_tests.ml
@@ -1,12 +1,9 @@
 open Trace
 open Test_helpers
-open Ast_simplified
+open Ast_core
 
 let type_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
diff --git a/src/test/id_tests.ml b/src/test/id_tests.ml
index bedc465db..8632c78e0 100644
--- a/src/test/id_tests.ml
+++ b/src/test/id_tests.ml
@@ -1,13 +1,10 @@
 open Trace
 open Test_helpers
-open Ast_simplified
+open Ast_core
 
 
 let mtype_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
   ok (typed,state)
 
 let get_program =
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 9fcb5f261..8b84434ed 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -1,28 +1,18 @@
 open Trace
 open Test_helpers
 
-open Ast_simplified.Combinators
+open Ast_core.Combinators
 
 let retype_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
-  let () = Typer.Solver.discard_state state in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "reasonligo" Env in
   let () = Typer.Solver.discard_state state in
   ok typed
 let mtype_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" Env in
   let () = Typer.Solver.discard_state state in
   ok typed
 let type_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "pascaligo" Env in
   let () = Typer.Solver.discard_state state in
   ok typed
 
@@ -434,52 +424,52 @@ let bytes_arithmetic () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program "hasherman" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman" foo in
   let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_simplified_input program "hasherman" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b3 , b1) in
+  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
 let crypto () : unit result =
   let%bind program = type_file "./contracts/crypto.ligo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
   let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foo in
+  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
+  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
   let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b5 , b4) in
+  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
 let crypto_mligo () : unit result =
   let%bind program = mtype_file "./contracts/crypto.mligo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
   let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foo in
+  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
+  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
   let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b5 , b4) in
+  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
 let crypto_religo () : unit result =
   let%bind program = retype_file "./contracts/crypto.religo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
   let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_simplified_input program "hasherman512" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foo in
+  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
+  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
   let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_simplified_input program "hasherman_blake" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b5 , b4) in
+  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
 let bytes_arithmetic_mligo () : unit result =
@@ -496,10 +486,10 @@ let bytes_arithmetic_mligo () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program "hasherman" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman" foo in
   let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_simplified_input program "hasherman" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b3 , b1) in
+  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
 let bytes_arithmetic_religo () : unit result =
@@ -516,10 +506,10 @@ let bytes_arithmetic_religo () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_simplified_input program"hasherman" foo in
+  let%bind b1 = Test_helpers.run_typed_program_with_core_input program"hasherman" foo in
   let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_simplified_input program "hasherman" foototo in
-  let%bind () = Assert.assert_fail @@ Ast_simplified.Misc.assert_value_eq (b3 , b1) in
+  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
 let set_arithmetic () : unit result =
@@ -984,7 +974,7 @@ let reoption () : unit result =
 let map_ type_f path : unit result =
   let%bind program = type_f path in
   let ez lst =
-    let open Ast_simplified.Combinators in
+    let open Ast_core.Combinators in
     let lst' = List.map (fun (x, y) -> e_int x, e_int y) lst in
     e_typed_map lst' t_int t_int
   in
@@ -1073,7 +1063,7 @@ let map_ type_f path : unit result =
 let big_map_ type_f path : unit result =
   let%bind program = type_f path in
   let ez lst =
-    let open Ast_simplified.Combinators in
+    let open Ast_core.Combinators in
     let lst' = List.map (fun (x, y) -> e_int x, e_int y) lst in
     (e_typed_big_map lst' t_int t_int)
   in
@@ -1286,7 +1276,7 @@ let loop () : unit result =
     expect_eq program "inner_capture_in_conditional_block"  input expected in
   let%bind () =
     let ez lst =
-      let open Ast_simplified.Combinators in
+      let open Ast_core.Combinators in
       let lst' = List.map (fun (x, y) -> e_string x, e_int y) lst in
         e_typed_map lst' t_string t_int
     in
@@ -2041,13 +2031,13 @@ let get_contract_ligo () : unit result =
   let%bind program = type_file "./contracts/get_contract.ligo" in
   let%bind () =
     let make_input = fun _n -> e_unit () in
-    let make_expected : int -> Ast_simplified.expression -> unit result = fun _n result ->
+    let make_expected : int -> Ast_core.expression -> unit result = fun _n result ->
       let%bind (ops , storage) = get_e_pair result.expression_content in
       let%bind () =
         let%bind lst = get_e_list ops.expression_content in
         Assert.assert_list_size lst 1 in
       let expected_storage = e_unit () in
-      Ast_simplified.Misc.assert_value_eq (expected_storage , storage)
+      Ast_core.Misc.assert_value_eq (expected_storage , storage)
       in
     let%bind () =
       let amount = Memory_proto_alpha.Protocol.Alpha_context.Tez.zero in
diff --git a/src/test/md_file_tests.ml b/src/test/md_file_tests.ml
index 042c6ebaa..6114e9126 100644
--- a/src/test/md_file_tests.ml
+++ b/src/test/md_file_tests.ml
@@ -68,10 +68,10 @@ let compile_groups _filename grp_list =
     (fun ((s,grp),contents) ->
       trace (failed_to_compile_md_file _filename (s,grp,contents)) @@
       let%bind v_syntax   = Compile.Helpers.syntax_to_variant (Syntax_name s) None in
-      let%bind abstracted = Compile.Of_source.compile_string contents v_syntax in
-      let%bind complex    = Ligo.Compile.Of_abstracted.compile abstracted in
-      let%bind simplified = Ligo.Compile.Of_complex.compile complex in
-      let%bind typed,_    = Compile.Of_simplified.compile Env simplified in
+      let%bind imperative = Compile.Of_source.compile_string contents v_syntax in
+      let%bind sugar      = Ligo.Compile.Of_imperative.compile imperative in
+      let%bind core       = Ligo.Compile.Of_sugar.compile sugar in
+      let%bind typed,_    = Compile.Of_core.compile Env core in
       let%bind mini_c     = Compile.Of_typed.compile typed in
       bind_map_list
         (fun ((_, _, exp),_) -> Compile.Of_mini_c.aggregate_and_compile_expression mini_c exp)
diff --git a/src/test/multisig_tests.ml b/src/test/multisig_tests.ml
index 0866302c0..4410df2eb 100644
--- a/src/test/multisig_tests.ml
+++ b/src/test/multisig_tests.ml
@@ -6,10 +6,7 @@ let mfile = "./contracts/multisig.mligo"
 let refile = "./contracts/multisig.religo"
 
 let type_file f s =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name s) in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f s (Contract "main") in
   ok @@ (typed,state)
 
 let get_program f st =
@@ -31,7 +28,7 @@ let compile_main f s () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_simplified
+open Ast_core
 
 let init_storage threshold counter pkeys =
   let keys = List.map
diff --git a/src/test/multisig_v2_tests.ml b/src/test/multisig_v2_tests.ml
index 01248c2dd..0ce171034 100644
--- a/src/test/multisig_v2_tests.ml
+++ b/src/test/multisig_v2_tests.ml
@@ -2,10 +2,7 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "pascaligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
@@ -27,7 +24,7 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_simplified
+open Ast_core
 
 let empty_op_list = 
   (e_typed_list [] t_operation)
diff --git a/src/test/pledge_tests.ml b/src/test/pledge_tests.ml
index 7d8d0abcf..f1dc76459 100644
--- a/src/test/pledge_tests.ml
+++ b/src/test/pledge_tests.ml
@@ -1,13 +1,10 @@
 open Trace
 open Test_helpers
-open Ast_simplified
+open Ast_core
 
 
 let retype_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "reasonligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile Env simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "reasonligo" Env in
   ok (typed,state)
 
 let get_program =
diff --git a/src/test/replaceable_id_tests.ml b/src/test/replaceable_id_tests.ml
index b3623025c..67cdd9402 100644
--- a/src/test/replaceable_id_tests.ml
+++ b/src/test/replaceable_id_tests.ml
@@ -2,10 +2,7 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "pascaligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
@@ -26,7 +23,7 @@ let compile_main () =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
-open Ast_simplified
+open Ast_core
 
 let empty_op_list = 
   (e_typed_list [] t_operation)
diff --git a/src/test/test_helpers.ml b/src/test/test_helpers.ml
index f7ca0f320..fc1227472 100644
--- a/src/test/test_helpers.ml
+++ b/src/test/test_helpers.ml
@@ -30,13 +30,13 @@ let test name f =
 let test_suite name lst = Test_suite (name , lst)
 
 
-open Ast_simplified
+open Ast_core
 
 let pack_payload (program:Ast_typed.program) (payload:expression) : bytes result =
   let%bind code =
     let env = Ast_typed.program_environment program in
 
-    let%bind (typed,_) = Compile.Of_simplified.compile_expression
+    let%bind (typed,_) = Compile.Of_core.compile_expression
         ~env ~state:(Typer.Solver.initial_state) payload in
     let%bind mini_c = Compile.Of_typed.compile_expression typed in
     Compile.Of_mini_c.compile_expression mini_c in
@@ -77,24 +77,24 @@ let sha_256_hash pl =
   let open Proto_alpha_utils.Memory_proto_alpha.Alpha_environment in
   Raw_hashes.sha256 pl
 
-open Ast_simplified.Combinators
+open Ast_core.Combinators
 
-let typed_program_with_simplified_input_to_michelson
+let typed_program_with_core_input_to_michelson
     (program: Ast_typed.program) (entry_point: string)
-    (input: Ast_simplified.expression) : Compiler.compiled_expression result =
+    (input: Ast_core.expression) : Compiler.compiled_expression result =
   Printexc.record_backtrace true;
   let env = Ast_typed.program_environment program in
   let state = Typer.Solver.initial_state in
-  let%bind app              = Compile.Of_simplified.apply entry_point input in
-  let%bind (typed_app,_)    = Compile.Of_simplified.compile_expression ~env ~state app in
+  let%bind app              = Compile.Of_core.apply entry_point input in
+  let%bind (typed_app,_)    = Compile.Of_core.compile_expression ~env ~state app in
   let%bind compiled_applied = Compile.Of_typed.compile_expression typed_app in
   let%bind mini_c_prg       = Compile.Of_typed.compile program in
   Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg compiled_applied
 
-let run_typed_program_with_simplified_input ?options
+let run_typed_program_with_core_input ?options
     (program: Ast_typed.program) (entry_point: string)
-    (input: Ast_simplified.expression) : Ast_simplified.expression result =
-  let%bind michelson_program = typed_program_with_simplified_input_to_michelson program entry_point input in
+    (input: Ast_core.expression) : Ast_core.expression result =
+  let%bind michelson_program = typed_program_with_core_input_to_michelson program entry_point input in
   let%bind michelson_output  = Ligo.Run.Of_michelson.run_no_failwith ?options michelson_program.expr michelson_program.expr_ty in
   Uncompile.uncompile_typed_program_entry_function_result program entry_point michelson_output
 
@@ -106,7 +106,7 @@ let expect ?options program entry_point input expecter =
       error title content
     in
     trace run_error @@
-    run_typed_program_with_simplified_input ?options program entry_point input in
+    run_typed_program_with_core_input ?options program entry_point input in
   expecter result
 
 let expect_fail ?options program entry_point input =
@@ -117,10 +117,10 @@ let expect_fail ?options program entry_point input =
   in
   trace run_error @@
   Assert.assert_fail @@
-  run_typed_program_with_simplified_input ?options program entry_point input
+  run_typed_program_with_core_input ?options program entry_point input
 
 let expect_string_failwith ?options program entry_point input expected_failwith =
-  let%bind michelson_program = typed_program_with_simplified_input_to_michelson program entry_point input in
+  let%bind michelson_program = typed_program_with_core_input_to_michelson program entry_point input in
   let%bind err = Ligo.Run.Of_michelson.run_failwith
     ?options michelson_program.expr michelson_program.expr_ty in
   match err with
@@ -132,11 +132,11 @@ let expect_eq ?options program entry_point input expected =
     let expect_error =
       let title () = "expect result" in
       let content () = Format.asprintf "Expected %a, got %a"
-          Ast_simplified.PP.expression expected
-          Ast_simplified.PP.expression result in
+          Ast_core.PP.expression expected
+          Ast_core.PP.expression result in
       error title content in
     trace expect_error @@
-    Ast_simplified.Misc.assert_value_eq (expected , result) in
+    Ast_core.Misc.assert_value_eq (expected , result) in
   expect ?options program entry_point input expecter
 
 let expect_evaluate program entry_point expecter =
@@ -154,7 +154,7 @@ let expect_evaluate program entry_point expecter =
 
 let expect_eq_evaluate program entry_point expected =
   let expecter = fun result ->
-    Ast_simplified.Misc.assert_value_eq (expected , result) in
+    Ast_core.Misc.assert_value_eq (expected , result) in
   expect_evaluate program entry_point expecter
 
 let expect_n_aux ?options lst program entry_point make_input make_expecter =
@@ -183,7 +183,7 @@ let expect_eq_exp_trace_aux ?options explst program entry_point make_input make_
   let aux exp =
     let%bind input = make_input exp in
     let%bind expected = make_expected exp in
-    let pps = Format.asprintf "%a" Ast_simplified.PP.expression exp in
+    let pps = Format.asprintf "%a" Ast_core.PP.expression exp in
     trace (simple_error ("expect_eq_exp " ^ pps )) @@
     let result = expect_eq ?options program entry_point input expected in
     result
@@ -195,7 +195,7 @@ let expect_failwith_exp_trace_aux ?options explst program entry_point make_input
   let aux exp =
     let%bind input = make_input exp in
     let%bind expected = make_expected_failwith exp in
-    let pps = Format.asprintf "%a" Ast_simplified.PP.expression exp in
+    let pps = Format.asprintf "%a" Ast_core.PP.expression exp in
     trace (simple_error ("expect_eq_exp " ^ pps )) @@
     let result = expect_string_failwith ?options program entry_point input expected in
     result
@@ -237,7 +237,7 @@ let expect_eq_n_int a b c =
   expect_eq_n a b e_int (fun n -> e_int (c n))
 
 let expect_eq_b_bool a b c =
-  let open Ast_simplified.Combinators in
+  let open Ast_core.Combinators in
   expect_eq_b a b (fun bool -> e_bool (c bool))
 
 
diff --git a/src/test/time_lock_repeat_tests.ml b/src/test/time_lock_repeat_tests.ml
index 35c70cfa3..f2610dadb 100644
--- a/src/test/time_lock_repeat_tests.ml
+++ b/src/test/time_lock_repeat_tests.ml
@@ -1,12 +1,9 @@
 open Trace
 open Test_helpers
-open Ast_simplified
+open Ast_core
 
 let type_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
diff --git a/src/test/time_lock_tests.ml b/src/test/time_lock_tests.ml
index d5247b3cd..37f936a29 100644
--- a/src/test/time_lock_tests.ml
+++ b/src/test/time_lock_tests.ml
@@ -2,10 +2,7 @@ open Trace
 open Test_helpers
 
 let type_file f = 
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "pascaligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
@@ -27,7 +24,7 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_simplified
+open Ast_core
 let empty_op_list =
   (e_typed_list [] t_operation)
 let empty_message = e_lambda (Var.of_name "arguments")
diff --git a/src/test/typer_tests.ml b/src/test/typer_tests.ml
index df0817ba8..57b06a7b7 100644
--- a/src/test/typer_tests.ml
+++ b/src/test/typer_tests.ml
@@ -1,10 +1,10 @@
 open Trace
-open Ast_simplified
+open Ast_core
 open Test_helpers
 
 module Typed = Ast_typed
 module Typer = Typer
-module Simplified = Ast_simplified
+module Simplified = Ast_core
 
 let int () : unit result =
   let open Combinators in
@@ -72,7 +72,7 @@ end
 (* TODO: deep types (e.g. record of record)
    TODO: negative tests (expected type error) *)
 
-let main = test_suite "Typer (from simplified AST)" [
+let main = test_suite "Typer (from core AST)" [
     test "int" int ;
     test "unit"        TestExpressions.unit ;
     test "int2"        TestExpressions.int ;
diff --git a/src/test/vote_tests.ml b/src/test/vote_tests.ml
index c572ce340..1fc2c5cd6 100644
--- a/src/test/vote_tests.ml
+++ b/src/test/vote_tests.ml
@@ -2,10 +2,7 @@ open Trace
 open Test_helpers
 
 let type_file f =
-  let%bind abstracted  = Ligo.Compile.Of_source.compile f (Syntax_name "cameligo") in
-  let%bind complex     = Ligo.Compile.Of_abstracted.compile abstracted in
-  let%bind simplified  = Ligo.Compile.Of_complex.compile complex in
-  let%bind typed,state = Ligo.Compile.Of_simplified.compile (Contract "main") simplified in
+  let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
   ok @@ (typed,state)
 
 let get_program =
@@ -18,7 +15,7 @@ let get_program =
         ok (program , state)
       )
 
-open Ast_simplified
+open Ast_core
 
 let init_storage name = e_record_ez [
     ("title" , e_string name) ;
@@ -41,14 +38,14 @@ let yea = e_constructor "Vote" (e_constructor "Yea" (e_unit ()))
 let init_vote () =
   let%bind (program , _) = get_program () in
   let%bind result =
-    Test_helpers.run_typed_program_with_simplified_input
+    Test_helpers.run_typed_program_with_core_input
       program "main" (e_pair yea (init_storage "basic")) in
   let%bind (_, storage) = extract_pair result in
   let%bind storage' = extract_record storage in
 (*  let votes = List.assoc (Label "voters") storage' in
   let%bind votes' = extract_map votes in *)
   let yea = List.assoc (Label "yea") storage' in
-  let%bind () = Ast_simplified.Misc.assert_value_eq (yea, e_nat 1) in
+  let%bind () = Ast_core.Misc.assert_value_eq (yea, e_nat 1) in
   ok ()
 
 let main = test_suite "Vote" [

From 6dd7afbeb1d1361ee926c33fdc25f7fae873c661 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Mon, 16 Mar 2020 14:53:56 +0100
Subject: [PATCH 38/43] change passes name concrete_to_imperative,
 imperative_to_sugar, sugar_to_core

---
 .../contributors/big-picture/front-end.md     |   4 +-
 src/bin/cli.ml                                |   8 +-
 src/main/compile/dune                         |   6 +-
 src/main/compile/helpers.ml                   |  18 +-
 src/main/compile/of_imperative.ml             |   6 +-
 src/main/compile/of_sugar.ml                  |   6 +-
 src/main/run/dune                             |   4 +-
 .../cameligo.ml                               | 184 ++++-----
 .../cameligo.mli                              |  24 +-
 .../camligo.ml.old                            |   0
 .../concrete_to_imperative.ml}                |   0
 .../dune                                      |   6 +-
 .../pascaligo.ml                              | 348 +++++++++---------
 .../pascaligo.mli                             |   4 +-
 .../dune                                      |   4 +-
 .../imperative_to_sugar.ml}                   | 114 +++---
 .../dune                                      |   0
 .../{6-simplifier => 6-sugar_to_core}/dune    |   4 +-
 .../sugar_to_core.ml}                         |  72 ++--
 .../dune                                      |   0
 src/passes/operators/operators.ml             |   2 +-
 src/passes/operators/operators.mli            |   2 +-
 22 files changed, 408 insertions(+), 408 deletions(-)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/cameligo.ml (86%)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/cameligo.mli (66%)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/camligo.ml.old (100%)
 rename src/passes/{2-abstracter/abstracter.ml => 2-concrete_to_imperative/concrete_to_imperative.ml} (100%)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/dune (67%)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/pascaligo.ml (82%)
 rename src/passes/{2-abstracter => 2-concrete_to_imperative}/pascaligo.mli (79%)
 rename src/passes/{4-Instruction_remover => 4-imperative_to_sugar}/dune (77%)
 rename src/passes/{4-Instruction_remover/instruction_remover.ml => 4-imperative_to_sugar/imperative_to_sugar.ml} (53%)
 rename src/passes/{5-self_ast_complex => 5-self_ast_sugar}/dune (100%)
 rename src/passes/{6-simplifier => 6-sugar_to_core}/dune (80%)
 rename src/passes/{6-simplifier/simplifier.ml => 6-sugar_to_core/sugar_to_core.ml} (73%)
 rename src/passes/{7-self_ast_simplified => 7-self_ast_core}/dune (100%)

diff --git a/gitlab-pages/docs/contributors/big-picture/front-end.md b/gitlab-pages/docs/contributors/big-picture/front-end.md
index d4bcfb9e7..d23fe884e 100644
--- a/gitlab-pages/docs/contributors/big-picture/front-end.md
+++ b/gitlab-pages/docs/contributors/big-picture/front-end.md
@@ -10,6 +10,6 @@ Its files are in `parser/parser_name`.
 ## Concrete Syntax Tree
 The CST is the aforementioned structured representation of the program. Is is structurally very close to the source code, and is mostly an intermediary there because manipulating string is not practical.
 Its files are in `parser/parser_name`.
-## Simplifier
-A Simplifier is a function that takes a CST and outputs the corresponding Common AST. This is the actual bridge between a given syntax and LIGO.
+## Sugar_to_core
+A Sugar_to_core is a function that takes a CST and outputs the corresponding Common AST. This is the actual bridge between a given syntax and LIGO.
 Its files are in `simplify/parser_name`.
diff --git a/src/bin/cli.ml b/src/bin/cli.ml
index 7292d66c1..950d64549 100644
--- a/src/bin/cli.ml
+++ b/src/bin/cli.ml
@@ -363,8 +363,8 @@ let run_function =
         let%bind failstring = Run.failwith_to_string fail_res in
         ok @@ Format.asprintf "%s" failstring
       | Success michelson_output ->
-        let%bind simplified_output = Uncompile.uncompile_typed_program_entry_function_result typed_prg entry_point michelson_output in
-        ok @@ Format.asprintf "%a\n" Ast_core.PP.expression simplified_output
+        let%bind core_output = Uncompile.uncompile_typed_program_entry_function_result typed_prg entry_point michelson_output in
+        ok @@ Format.asprintf "%a\n" Ast_core.PP.expression core_output
   in
   let term =
     Term.(const f $ source_file 0 $ entry_point 1 $ expression "PARAMETER" 2 $ amount $ balance $ sender $ source $ predecessor_timestamp $ syntax $ display_format) in
@@ -381,8 +381,8 @@ let evaluate_value =
     let%bind compiled          = Compile.Of_mini_c.aggregate_and_compile_expression mini_c exp in
     let%bind options           = Run.make_dry_run_options {predecessor_timestamp ; amount ; balance ; sender ; source } in
     let%bind michelson_output  = Run.run_no_failwith ~options compiled.expr compiled.expr_ty in
-    let%bind simplified_output = Uncompile.uncompile_typed_program_entry_expression_result typed_prg entry_point michelson_output in
-    ok @@ Format.asprintf "%a\n" Ast_core.PP.expression simplified_output
+    let%bind core_output = Uncompile.uncompile_typed_program_entry_expression_result typed_prg entry_point michelson_output in
+    ok @@ Format.asprintf "%a\n" Ast_core.PP.expression core_output
   in
   let term =
     Term.(const f $ source_file 0 $ entry_point 1 $ amount $ balance $ sender $ source $ predecessor_timestamp $ syntax $ display_format) in
diff --git a/src/main/compile/dune b/src/main/compile/dune
index 323200979..6a900909f 100644
--- a/src/main/compile/dune
+++ b/src/main/compile/dune
@@ -5,13 +5,13 @@
     simple-utils
     tezos-utils
     parser
-    abstracter
+    concrete_to_imperative
     ast_imperative
     self_ast_imperative
-    instruction_remover
+    imperative_to_sugar
     ast_sugar
     self_ast_sugar
-    simplifier
+    sugar_to_core
     ast_core
     self_ast_core
     typer_new
diff --git a/src/main/compile/helpers.ml b/src/main/compile/helpers.ml
index 4fabbd0fa..1b8b390fc 100644
--- a/src/main/compile/helpers.ml
+++ b/src/main/compile/helpers.ml
@@ -25,7 +25,7 @@ let parsify_pascaligo source =
     Parser.Pascaligo.parse_file source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-      Abstracter.Pascaligo.abstr_program raw
+      Concrete_to_imperative.Pascaligo.compile_program raw
   in ok imperative
 
 let parsify_expression_pascaligo source =
@@ -34,7 +34,7 @@ let parsify_expression_pascaligo source =
     Parser.Pascaligo.parse_expression source in
   let%bind imperative =
     trace (simple_error "abstracting expression") @@
-    Abstracter.Pascaligo.abstr_expression raw
+    Concrete_to_imperative.Pascaligo.compile_expression raw
   in ok imperative
 
 let parsify_cameligo source =
@@ -43,7 +43,7 @@ let parsify_cameligo source =
     Parser.Cameligo.parse_file source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-    Abstracter.Cameligo.abstr_program raw
+    Concrete_to_imperative.Cameligo.compile_program raw
   in ok imperative
 
 let parsify_expression_cameligo source =
@@ -52,7 +52,7 @@ let parsify_expression_cameligo source =
     Parser.Cameligo.parse_expression source in
   let%bind imperative =
     trace (simple_error "abstracting expression") @@
-    Abstracter.Cameligo.abstr_expression raw
+    Concrete_to_imperative.Cameligo.compile_expression raw
   in ok imperative
 
 let parsify_reasonligo source =
@@ -61,7 +61,7 @@ let parsify_reasonligo source =
     Parser.Reasonligo.parse_file source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-    Abstracter.Cameligo.abstr_program raw
+    Concrete_to_imperative.Cameligo.compile_program raw
   in ok imperative
 
 let parsify_expression_reasonligo source =
@@ -70,7 +70,7 @@ let parsify_expression_reasonligo source =
     Parser.Reasonligo.parse_expression source in
   let%bind imperative =
     trace (simple_error "abstracting expression") @@
-    Abstracter.Cameligo.abstr_expression raw
+    Concrete_to_imperative.Cameligo.compile_expression raw
   in ok imperative
 
 let parsify syntax source =
@@ -98,7 +98,7 @@ let parsify_string_reasonligo source =
     Parser.Reasonligo.parse_string source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-    Abstracter.Cameligo.abstr_program raw
+    Concrete_to_imperative.Cameligo.compile_program raw
   in ok imperative
 
 let parsify_string_pascaligo source =
@@ -107,7 +107,7 @@ let parsify_string_pascaligo source =
     Parser.Pascaligo.parse_string source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-    Abstracter.Pascaligo.abstr_program raw
+    Concrete_to_imperative.Pascaligo.compile_program raw
   in ok imperative
 
 let parsify_string_cameligo source =
@@ -116,7 +116,7 @@ let parsify_string_cameligo source =
     Parser.Cameligo.parse_string source in
   let%bind imperative =
     trace (simple_error "abstracting") @@
-    Abstracter.Cameligo.abstr_program raw
+    Concrete_to_imperative.Cameligo.compile_program raw
   in ok imperative
 
 let parsify_string syntax source =
diff --git a/src/main/compile/of_imperative.ml b/src/main/compile/of_imperative.ml
index cc84ff4d7..ed12a128e 100644
--- a/src/main/compile/of_imperative.ml
+++ b/src/main/compile/of_imperative.ml
@@ -1,16 +1,16 @@
 open Trace
 open Ast_imperative
-open Instruction_remover
+open Imperative_to_sugar
 
 type form = 
   | Contract of string
   | Env
 
 let compile (program : program) : Ast_sugar.program result =
-  remove_instruction_in_program program
+  compile_program program
 
 let compile_expression (e : expression) : Ast_sugar.expression result =
-  remove_instruction_in_expression e
+  compile_expression e
 
 let pretty_print formatter (program : program) = 
   PP.program formatter program
diff --git a/src/main/compile/of_sugar.ml b/src/main/compile/of_sugar.ml
index 9073bf615..b52607af7 100644
--- a/src/main/compile/of_sugar.ml
+++ b/src/main/compile/of_sugar.ml
@@ -1,16 +1,16 @@
 open Trace
 open Ast_sugar
-open Simplifier
+open Sugar_to_core
 
 type form = 
   | Contract of string
   | Env
 
 let compile (program : program) : Ast_core.program result =
-  simplify_program program
+  compile_program program
 
 let compile_expression (e : expression) : Ast_core.expression result =
-  simplify_expression e
+  compile_expression e
 
 let pretty_print formatter (program : program) = 
   PP.program formatter program
diff --git a/src/main/run/dune b/src/main/run/dune
index 55644e553..c5179a3e6 100644
--- a/src/main/run/dune
+++ b/src/main/run/dune
@@ -5,9 +5,9 @@
     simple-utils
     tezos-utils
     parser
-    abstracter
+    concrete_to_imperative
     self_ast_imperative
-    simplifier
+    sugar_to_core
     ast_core
     typer_new
     typer
diff --git a/src/passes/2-abstracter/cameligo.ml b/src/passes/2-concrete_to_imperative/cameligo.ml
similarity index 86%
rename from src/passes/2-abstracter/cameligo.ml
rename to src/passes/2-concrete_to_imperative/cameligo.ml
index 9cf5891eb..f6b2ef165 100644
--- a/src/passes/2-abstracter/cameligo.ml
+++ b/src/passes/2-concrete_to_imperative/cameligo.ml
@@ -156,7 +156,7 @@ end
 
 open Errors
 
-open Operators.Abstracter.Cameligo
+open Operators.Concrete_to_imperative.Cameligo
 
 let r_split = Location.r_split
 
@@ -205,7 +205,7 @@ let rec typed_pattern_to_typed_vars : Raw.pattern -> _ = fun pattern ->
   | Raw.PTyped pt ->
      let (p,t) = pt.value.pattern,pt.value.type_expr in
      let%bind p = tuple_pattern_to_vars p in 
-     let%bind t = abstr_type_expression t in
+     let%bind t = compile_type_expression t in
      ok @@ (p,t)
   | other -> (fail @@ wrong_pattern "parenthetical or type annotation" other)
 
@@ -213,10 +213,10 @@ and unpar_pattern : Raw.pattern -> Raw.pattern = function
   | PPar p -> unpar_pattern p.value.inside
   | _ as p -> p
 
-and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
+and compile_type_expression : Raw.type_expr -> type_expression result = fun te ->
   trace (simple_info "abstracting this type expression...") @@
   match te with
-    TPar x -> abstr_type_expression x.value.inside
+    TPar x -> compile_type_expression x.value.inside
   | TVar v -> (
       match type_constants v.value with
       | Ok (s,_) -> ok @@ make_t @@ T_constant s
@@ -225,8 +225,8 @@ and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
   | TFun x -> (
       let%bind (type1 , type2) =
         let (a , _ , b) = x.value in
-        let%bind a = abstr_type_expression a in
-        let%bind b = abstr_type_expression b in
+        let%bind a = compile_type_expression a in
+        let%bind b = compile_type_expression b in
         ok (a , b)
       in
       ok @@ make_t @@ T_arrow {type1;type2}
@@ -234,18 +234,18 @@ and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
   | TApp x -> (
       let (name, tuple) = x.value in
       let lst = npseq_to_list tuple.value.inside in
-      let%bind lst' = bind_map_list abstr_type_expression lst in
+      let%bind lst' = bind_map_list compile_type_expression lst in
       let%bind cst =
         trace (unknown_predefined_type name) @@
         type_operators name.value in
       t_operator cst lst'
     )
   | TProd p -> (
-      let%bind tpl = abstr_list_type_expression  @@ npseq_to_list p.value in
+      let%bind tpl = compile_list_type_expression  @@ npseq_to_list p.value in
       ok tpl
     )
   | TRecord r ->
-      let aux = fun (x, y) -> let%bind y = abstr_type_expression y in ok (x, y) in
+      let aux = fun (x, y) -> let%bind y = compile_type_expression y in ok (x, y) in
       let apply (x:Raw.field_decl Raw.reg) =
         (x.value.field_name.value, x.value.field_type) in
       let%bind lst =
@@ -262,7 +262,7 @@ and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
             None -> []
           | Some (_, TProd product) -> npseq_to_list product.value
           | Some (_, t_expr) -> [t_expr] in
-        let%bind te = abstr_list_type_expression @@ args in
+        let%bind te = compile_list_type_expression @@ args in
         ok (v.value.constr.value, te) in
       let%bind lst = bind_list
         @@ List.map aux
@@ -270,18 +270,18 @@ and abstr_type_expression : Raw.type_expr -> type_expression result = fun te ->
       let m = List.fold_left (fun m (x, y) -> CMap.add (Constructor x) y m) CMap.empty lst in
       ok @@ make_t @@ T_sum m
 
-and abstr_list_type_expression (lst:Raw.type_expr list) : type_expression result =
+and compile_list_type_expression (lst:Raw.type_expr list) : type_expression result =
   match lst with
   | [] -> ok @@ t_unit
-  | [hd] -> abstr_type_expression hd
+  | [hd] -> compile_type_expression hd
   | lst ->
-      let%bind lst = bind_map_list abstr_type_expression lst in
+      let%bind lst = bind_map_list compile_type_expression lst in
       ok @@ t_tuple lst
 
-let rec abstr_expression :
+let rec compile_expression :
   Raw.expr -> expr result = fun t ->
   let return x = ok x in
-  let abstr_projection = fun (p:Raw.projection Region.reg) ->
+  let compile_projection = fun (p:Raw.projection Region.reg) ->
     let (p , loc) = r_split p in
     let var =
       let name = Var.of_name p.struct_name.value in
@@ -296,7 +296,7 @@ let rec abstr_expression :
       List.map aux @@ npseq_to_list path in
     return @@ List.fold_left (e_accessor ~loc ) var path'
   in
-  let abstr_path : Raw.path -> string * label list = fun p ->
+  let compile_path : Raw.path -> string * label list = fun p ->
     match p with
     | Raw.Name v -> (v.value , [])
     | Raw.Path p -> (
@@ -313,9 +313,9 @@ let rec abstr_expression :
         (var , path')
       )
   in
-  let abstr_update = fun (u:Raw.update Region.reg) ->
+  let compile_update = fun (u:Raw.update Region.reg) ->
     let (u, loc) = r_split u in
-    let (name, path) = abstr_path u.record in
+    let (name, path) = compile_path u.record in
     let record = match path with
     | [] -> e_variable (Var.of_name name)
     | _ ->
@@ -325,7 +325,7 @@ let rec abstr_expression :
     let%bind updates' =
       let aux (f:Raw.field_path_assign Raw.reg) =
         let (f,_) = r_split f in
-        let%bind expr = abstr_expression f.field_expr in
+        let%bind expr = compile_expression f.field_expr in
         ok ( List.map (fun (x: _ Raw.reg) -> x.value) (npseq_to_list f.field_path), expr)
       in
       bind_map_list aux @@ npseq_to_list updates
@@ -352,20 +352,20 @@ let rec abstr_expression :
       | (p, []) ->
       let%bind variables = tuple_pattern_to_typed_vars p in
       let%bind ty_opt =
-        bind_map_option (fun (_,te) -> abstr_type_expression te) lhs_type in
-      let%bind rhs = abstr_expression let_rhs in
+        bind_map_option (fun (_,te) -> compile_type_expression te) lhs_type in
+      let%bind rhs = compile_expression let_rhs in
       let rhs_b = Var.fresh ~name: "rhs" () in
       let rhs',rhs_b_expr =
         match ty_opt with
           None -> rhs, e_variable rhs_b
         | Some ty -> (e_annotation rhs ty), e_annotation (e_variable rhs_b) ty in
-      let%bind body = abstr_expression body in
+      let%bind body = compile_expression body in
       let prepare_variable (ty_var: Raw.variable * Raw.type_expr option) =
         let variable, ty_opt = ty_var in
         let var_expr = Var.of_name variable.value in
         let%bind ty_expr_opt =
           match ty_opt with
-          | Some ty -> bind_map_option abstr_type_expression (Some ty)
+          | Some ty -> bind_map_option compile_type_expression (Some ty)
           | None -> ok None
         in ok (var_expr, ty_expr_opt)
       in
@@ -397,7 +397,7 @@ let rec abstr_expression :
       | None -> (match let_rhs with 
         | EFun {value={binders;lhs_type}} -> 
           let f_args = nseq_to_list (binders) in
-          let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
+          let%bind lhs_type' = bind_map_option (fun x -> compile_type_expression (snd x)) lhs_type in
           let%bind ty = bind_map_list typed_pattern_to_typed_vars f_args in
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok @@ (List.fold_right' aux lhs_type' ty)
@@ -444,8 +444,8 @@ let rec abstr_expression :
       end
   | Raw.EAnnot a ->
       let Raw.{inside=expr, _, type_expr; _}, loc = r_split a in
-      let%bind expr' = abstr_expression expr in
-      let%bind type_expr' = abstr_type_expression type_expr in
+      let%bind expr' = compile_expression expr in
+      let%bind type_expr' = compile_type_expression type_expr in
       return @@ e_annotation ~loc expr' type_expr'
   | EVar c ->
       let (c',loc) = r_split c in
@@ -454,7 +454,7 @@ let rec abstr_expression :
        | Ok (s,_) -> return @@ e_constant s [])
   | ECall x -> (
       let ((e1 , e2) , loc) = r_split x in
-      let%bind args = bind_map_list abstr_expression (nseq_to_list e2) in
+      let%bind args = bind_map_list compile_expression (nseq_to_list e2) in
       let rec chain_application (f: expression) (args: expression list) =
         match args with
         | hd :: tl ->  chain_application (e_application ~loc f hd) tl
@@ -468,29 +468,29 @@ let rec abstr_expression :
           | Ok (s, _) -> return @@ e_constant ~loc s args
               )
       | e1 ->
-          let%bind e1' = abstr_expression e1 in
+          let%bind e1' = compile_expression e1 in
           return @@ chain_application e1' args
   )
-  | EPar x -> abstr_expression x.value.inside
+  | EPar x -> compile_expression x.value.inside
   | EUnit reg ->
       let (_ , loc) = r_split reg in
       return @@ e_literal ~loc Literal_unit
   | EBytes x ->
       let (x , loc) = r_split x in
       return @@ e_literal ~loc (Literal_bytes (Hex.to_bytes @@ snd x))
-  | ETuple tpl -> abstr_tuple_expression @@ (npseq_to_list tpl.value)
+  | ETuple tpl -> compile_tuple_expression @@ (npseq_to_list tpl.value)
   | ERecord r ->
       let (r , loc) = r_split r in
       let%bind fields = bind_list
-        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = abstr_expression v in ok (k.value, v))
+        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = compile_expression v in ok (k.value, v))
         @@ List.map (fun (x:Raw.field_assign Raw.reg) -> (x.value.field_name, x.value.field_expr))
         @@ npseq_to_list r.ne_elements in
       return @@ e_record_ez ~loc fields
-  | EProj p -> abstr_projection p
-  | EUpdate u -> abstr_update u
+  | EProj p -> compile_projection p
+  | EUpdate u -> compile_update u
   | EConstr (ESomeApp a) ->
       let (_, args), loc = r_split a in
-      let%bind arg = abstr_expression args in
+      let%bind arg = compile_expression args in
       return @@ e_constant ~loc C_SOME [arg]
   | EConstr (ENone reg) ->
       let loc = Location.lift reg in
@@ -502,18 +502,18 @@ let rec abstr_expression :
         match args with
           None -> []
         | Some arg -> [arg] in
-      let%bind arg = abstr_tuple_expression @@ args
+      let%bind arg = compile_tuple_expression @@ args
       in return @@ e_constructor ~loc c_name arg
   | EArith (Add c) ->
-      abstr_binop "ADD" c
+      compile_binop "ADD" c
   | EArith (Sub c) ->
-      abstr_binop "SUB" c
+      compile_binop "SUB" c
   | EArith (Mult c) ->
-      abstr_binop "TIMES" c
+      compile_binop "TIMES" c
   | EArith (Div c) ->
-      abstr_binop "DIV" c
+      compile_binop "DIV" c
   | EArith (Mod c) ->
-      abstr_binop "MOD" c
+      compile_binop "MOD" c
   | EArith (Int n) -> (
       let (n , loc) = r_split n in
       let n = Z.to_int @@ snd @@ n in
@@ -529,7 +529,7 @@ let rec abstr_expression :
       let n = Z.to_int @@ snd @@ n in
       return @@ e_literal ~loc (Literal_mutez n)
     )
-  | EArith (Neg e) -> abstr_unop "NEG" e
+  | EArith (Neg e) -> compile_unop "NEG" e
   | EString (String s) -> (
       let (s , loc) = r_split s in
       let s' =
@@ -540,24 +540,24 @@ let rec abstr_expression :
     )
   | EString (Cat c) ->
     let (c, loc) = r_split c in
-    let%bind string_left = abstr_expression c.arg1 in
-    let%bind string_right = abstr_expression c.arg2 in
+    let%bind string_left = compile_expression c.arg1 in
+    let%bind string_right = compile_expression c.arg2 in
     return @@ e_string_cat ~loc string_left string_right
-  | ELogic l -> abstr_logic_expression l
-  | EList l -> abstr_list_expression l
+  | ELogic l -> compile_logic_expression l
+  | EList l -> compile_list_expression l
   | ECase c -> (
       let (c , loc) = r_split c in
-      let%bind e = abstr_expression c.expr in
+      let%bind e = compile_expression c.expr in
       let%bind lst =
         let aux (x : Raw.expr Raw.case_clause) =
-          let%bind expr = abstr_expression x.rhs in
+          let%bind expr = compile_expression x.rhs in
           ok (x.pattern, expr) in
         bind_list
         @@ List.map aux
         @@ List.map get_value
         @@ npseq_to_list c.cases.value in
       let default_action () =
-        let%bind cases = abstr_cases lst in
+        let%bind cases = compile_cases lst in
         return @@ e_matching ~loc e  cases in
       (* Hack to take care of patterns introduced by `parser/cameligo/Parser.mly` in "norm_fun_expr". TODO: Still needed? *)
       match lst with
@@ -571,7 +571,7 @@ let rec abstr_expression :
                   match x'.pattern with
                   | Raw.PVar y ->
                     let var_name = Var.of_name y.value in
-                    let%bind type_expr = abstr_type_expression x'.type_expr in
+                    let%bind type_expr = compile_type_expression x'.type_expr in
                     return @@ e_let_in (var_name , Some type_expr) false false e rhs
                   | _ -> default_action ()
                 )
@@ -581,29 +581,29 @@ let rec abstr_expression :
         )
       | _ -> default_action ()
     )
-  | EFun lamb -> abstr_fun lamb
+  | EFun lamb -> compile_fun lamb
   | ESeq s -> (
       let (s , loc) = r_split s in
       let items : Raw.expr list = pseq_to_list s.elements in
       (match items with
          [] -> return @@ e_skip ~loc ()
        | expr::more ->
-          let expr' = abstr_expression expr in
+          let expr' = compile_expression expr in
           let apply (e1: Raw.expr) (e2: expression Trace.result) =
-            let%bind a = abstr_expression e1 in
+            let%bind a = compile_expression e1 in
             let%bind e2' = e2 in
             return @@ e_sequence a e2'
           in List.fold_right apply more expr')
     )
   | ECond c -> (
       let (c , loc) = r_split c in
-      let%bind expr = abstr_expression c.test in
-      let%bind match_true = abstr_expression c.ifso in
-      let%bind match_false = abstr_expression c.ifnot in
+      let%bind expr = compile_expression c.test in
+      let%bind match_true = compile_expression c.ifso in
+      let%bind match_false = compile_expression c.ifnot in
       return @@ e_matching ~loc expr (Match_bool {match_true; match_false})
     )
 
-and abstr_fun lamb' : expr result =
+and compile_fun lamb' : expr result =
   let return x = ok x in
   let (lamb , loc) = r_split lamb' in
   let%bind params' =
@@ -649,7 +649,7 @@ and abstr_fun lamb' : expr result =
       | _ , None ->
           fail @@ untyped_fun_param var
       | _ , Some ty -> (
-        let%bind ty' = abstr_type_expression ty in
+        let%bind ty' = compile_type_expression ty in
         ok (var , ty')
       )
     in
@@ -700,8 +700,8 @@ and abstr_fun lamb' : expr result =
   in
   let%bind (body , body_type) = expr_to_typed_expr body in
   let%bind output_type =
-    bind_map_option abstr_type_expression body_type in
-  let%bind body = abstr_expression body in
+    bind_map_option compile_type_expression body_type in
+  let%bind body = compile_expression body in
   let rec layer_arguments (arguments: (Raw.variable * type_expression) list) =
     match arguments with
     | hd :: tl ->
@@ -714,7 +714,7 @@ and abstr_fun lamb' : expr result =
   return @@ ret_lamb
 
 
-and abstr_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
+and compile_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
   let return x = ok @@ make_option_typed x te_annot in
   match t with
   | BoolExpr (False reg) -> (
@@ -726,61 +726,61 @@ and abstr_logic_expression ?te_annot (t:Raw.logic_expr) : expr result =
       return @@ e_literal ~loc (Literal_bool true)
     )
   | BoolExpr (Or b) ->
-      abstr_binop "OR" b
+      compile_binop "OR" b
   | BoolExpr (And b) ->
-      abstr_binop "AND" b
+      compile_binop "AND" b
   | BoolExpr (Not b) ->
-      abstr_unop "NOT" b
+      compile_unop "NOT" b
   | CompExpr (Lt c) ->
-      abstr_binop "LT" c
+      compile_binop "LT" c
   | CompExpr (Gt c) ->
-      abstr_binop "GT" c
+      compile_binop "GT" c
   | CompExpr (Leq c) ->
-      abstr_binop "LE" c
+      compile_binop "LE" c
   | CompExpr (Geq c) ->
-      abstr_binop "GE" c
+      compile_binop "GE" c
   | CompExpr (Equal c) ->
-      abstr_binop "EQ" c
+      compile_binop "EQ" c
   | CompExpr (Neq c) ->
-      abstr_binop "NEQ" c
+      compile_binop "NEQ" c
 
-and abstr_list_expression (t:Raw.list_expr) : expression result =
+and compile_list_expression (t:Raw.list_expr) : expression result =
   let return x = ok @@ x in
   match t with
-    ECons c -> abstr_binop "CONS" c
+    ECons c -> compile_binop "CONS" c
   | EListComp lst -> (
       let (lst , loc) = r_split lst in
       let%bind lst' =
-        bind_map_list abstr_expression @@
+        bind_map_list compile_expression @@
         pseq_to_list lst.elements in
       return @@ e_list ~loc lst'
     )
 
-and abstr_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
+and compile_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
   let return x = ok @@ x in
   let (args , loc) = r_split t in
-  let%bind a = abstr_expression args.arg1 in
-  let%bind b = abstr_expression args.arg2 in
+  let%bind a = compile_expression args.arg1 in
+  let%bind b = compile_expression args.arg2 in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ; b ]
 
-and abstr_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
+and compile_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
   let return x = ok @@ x in
   let (t , loc) = r_split t in
-  let%bind a = abstr_expression t.arg in
+  let%bind a = compile_expression t.arg in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ]
 
-and abstr_tuple_expression ?loc (lst:Raw.expr list) : expression result =
+and compile_tuple_expression ?loc (lst:Raw.expr list) : expression result =
   let return x = ok @@ x in
   match lst with
   | [] -> return @@ e_literal ?loc Literal_unit
-  | [hd] -> abstr_expression hd
+  | [hd] -> compile_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map abstr_expression lst in
+      let%bind lst = bind_list @@ List.map compile_expression lst in
       return @@ e_tuple ?loc lst
 
-and abstr_declaration : Raw.declaration -> declaration Location.wrap list result =
+and compile_declaration : Raw.declaration -> declaration Location.wrap list result =
   fun t ->
   let open! Raw in
   let loc : 'a . 'a Raw.reg -> _ -> _ =
@@ -788,7 +788,7 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
   match t with
   | TypeDecl x ->
       let {name;type_expr} : Raw.type_decl = x.value in
-      let%bind type_expression = abstr_type_expression type_expr in
+      let%bind type_expression = compile_type_expression type_expr in
       ok @@ [loc x @@ Declaration_type (Var.of_name name.value , type_expression)]
   | Let x -> (
       let (_, recursive, let_binding, attributes), _ = r_split x in
@@ -803,11 +803,11 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
             let%bind (v, v_type) = pattern_to_typed_var par_var in
             let%bind v_type_expression =
               match v_type with
-              | Some v_type -> ok (to_option (abstr_type_expression v_type))
+              | Some v_type -> ok (to_option (compile_type_expression v_type))
               | None -> ok None
             in
-            let%bind abstr_rhs_expr = abstr_expression rhs_expr in
-              ok @@ loc x @@ Declaration_constant (Var.of_name v.value, v_type_expression, inline, abstr_rhs_expr) )
+            let%bind compile_rhs_expr = compile_expression rhs_expr in
+              ok @@ loc x @@ Declaration_constant (Var.of_name v.value, v_type_expression, inline, compile_rhs_expr) )
           in let%bind variables = ok @@ npseq_to_list pt.value
           in let%bind expr_bind_lst =
                match let_rhs with
@@ -847,7 +847,7 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
         | PPar {region = _ ; value = { lpar = _ ; inside = pt; rpar = _; } } ->
           (* Extract parenthetical multi-bind *)
           let (wild, recursive, _, attributes) = fst @@ r_split x in
-          abstr_declaration
+          compile_declaration
             (Let {
                 region = x.region;
                 value = (wild, recursive, {binders = (pt, []);
@@ -862,7 +862,7 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
         let%bind var = pattern_to_var hd in
         ok (var , tl)
       in
-      let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
+      let%bind lhs_type' = bind_map_option (fun x -> compile_type_expression (snd x)) lhs_type in
       let%bind let_rhs,lhs_type = match args with
       | [] -> ok (let_rhs, lhs_type')
       | param1::others ->
@@ -878,12 +878,12 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok (Raw.EFun {region=Region.ghost ; value=fun_},List.fold_right' aux lhs_type' ty)
       in
-      let%bind rhs' = abstr_expression let_rhs in
+      let%bind rhs' = compile_expression let_rhs in
       let%bind lhs_type = match lhs_type with 
       | None -> (match let_rhs with 
         | EFun {value={binders;lhs_type}} -> 
           let f_args = nseq_to_list (binders) in
-          let%bind lhs_type' = bind_map_option (fun x -> abstr_type_expression (snd x)) lhs_type in
+          let%bind lhs_type' = bind_map_option (fun x -> compile_type_expression (snd x)) lhs_type in
           let%bind ty = bind_map_list typed_pattern_to_typed_vars f_args in
           let aux acc ty = Option.map (t_function (snd ty)) acc in
           ok @@ (List.fold_right' aux lhs_type' ty)
@@ -906,7 +906,7 @@ and abstr_declaration : Raw.declaration -> declaration Location.wrap list result
       ok @@ [loc x @@ (Declaration_constant (Var.of_name var.value , lhs_type , inline, rhs'))]
     )
 
-and abstr_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content result =
+and compile_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content result =
   fun t ->
   let open Raw in
   let rec get_var (t:Raw.pattern) =
@@ -1026,6 +1026,6 @@ and abstr_cases : type a . (Raw.pattern * a) list -> (a, unit) matching_content
         | _ -> simple_fail "bad option pattern"
       in bind_or (as_option () , as_variant ())
 
-let abstr_program : Raw.ast -> program result = fun t ->
-  let%bind decls = bind_map_list abstr_declaration @@ nseq_to_list t.decl in
+let compile_program : Raw.ast -> program result = fun t ->
+  let%bind decls = bind_map_list compile_declaration @@ nseq_to_list t.decl in
   ok @@ List.concat @@ decls
diff --git a/src/passes/2-abstracter/cameligo.mli b/src/passes/2-concrete_to_imperative/cameligo.mli
similarity index 66%
rename from src/passes/2-abstracter/cameligo.mli
rename to src/passes/2-concrete_to_imperative/cameligo.mli
index f2e56b348..f9e4b852a 100644
--- a/src/passes/2-abstracter/cameligo.mli
+++ b/src/passes/2-concrete_to_imperative/cameligo.mli
@@ -45,18 +45,18 @@ val pattern_to_var : Raw.pattern -> Raw.variable result
 val pattern_to_typed_var : Raw.pattern -> ( Raw.variable * Raw.type_expr option ) result
 val expr_to_typed_expr : Raw.expr -> ( Raw.expr * Raw.type_expr option ) result
 val patterns_to_var : Raw.pattern list -> Raw.variable result
-val abstr_type_expression : Raw.type_expr -> type_expression result
-val abstr_list_type_expression : Raw.type_expr list -> type_expression result
+val compile_type_expression : Raw.type_expr -> type_expression result
+val compile_list_type_expression : Raw.type_expr list -> type_expression result
 *)
-val abstr_expression : Raw.expr -> expr result
+val compile_expression : Raw.expr -> expr result
 (*
-val abstr_fun : Raw.fun_expr Raw.reg -> expr result 
-val abstr_logic_expression : ?te_annot:type_expression -> Raw.logic_expr -> expr result
-val abstr_list_expression : Raw.list_expr -> expression result
-val abstr_binop : string -> Raw.wild Raw.bin_op Region.reg -> expression result 
-val abstr_unop : string -> Raw.wild Raw.un_op Region.reg -> expression result
-val abstr_tuple_expression : ?loc:Location.t -> Raw.expr list -> expression result
-val abstr_declaration : Raw.declaration -> declaration Location.wrap result
-val abstr_cases : (Raw.pattern * 'a) list -> 'a matching result
+val compile_fun : Raw.fun_expr Raw.reg -> expr result 
+val compile_logic_expression : ?te_annot:type_expression -> Raw.logic_expr -> expr result
+val compile_list_expression : Raw.list_expr -> expression result
+val compile_binop : string -> Raw.wild Raw.bin_op Region.reg -> expression result 
+val compile_unop : string -> Raw.wild Raw.un_op Region.reg -> expression result
+val compile_tuple_expression : ?loc:Location.t -> Raw.expr list -> expression result
+val compile_declaration : Raw.declaration -> declaration Location.wrap result
+val compile_cases : (Raw.pattern * 'a) list -> 'a matching result
 *)
-val abstr_program : Raw.ast -> program result
+val compile_program : Raw.ast -> program result
diff --git a/src/passes/2-abstracter/camligo.ml.old b/src/passes/2-concrete_to_imperative/camligo.ml.old
similarity index 100%
rename from src/passes/2-abstracter/camligo.ml.old
rename to src/passes/2-concrete_to_imperative/camligo.ml.old
diff --git a/src/passes/2-abstracter/abstracter.ml b/src/passes/2-concrete_to_imperative/concrete_to_imperative.ml
similarity index 100%
rename from src/passes/2-abstracter/abstracter.ml
rename to src/passes/2-concrete_to_imperative/concrete_to_imperative.ml
diff --git a/src/passes/2-abstracter/dune b/src/passes/2-concrete_to_imperative/dune
similarity index 67%
rename from src/passes/2-abstracter/dune
rename to src/passes/2-concrete_to_imperative/dune
index a18e1a3cd..c3f316ce4 100644
--- a/src/passes/2-abstracter/dune
+++ b/src/passes/2-concrete_to_imperative/dune
@@ -1,6 +1,6 @@
 (library
-  (name abstracter)
-  (public_name ligo.abstracter)
+  (name concrete_to_imperative)
+  (public_name ligo.concrete_to_imperative)
   (libraries
     simple-utils
     tezos-utils
@@ -8,7 +8,7 @@
     ast_imperative
     self_ast_imperative
     operators)
-  (modules cameligo pascaligo abstracter)
+  (modules cameligo pascaligo concrete_to_imperative)
   (preprocess
     (pps
       ppx_let
diff --git a/src/passes/2-abstracter/pascaligo.ml b/src/passes/2-concrete_to_imperative/pascaligo.ml
similarity index 82%
rename from src/passes/2-abstracter/pascaligo.ml
rename to src/passes/2-concrete_to_imperative/pascaligo.ml
index d36a4532d..7823cfb4e 100644
--- a/src/passes/2-abstracter/pascaligo.ml
+++ b/src/passes/2-concrete_to_imperative/pascaligo.ml
@@ -199,7 +199,7 @@ module Errors = struct
 end
 
 open Errors
-open Operators.Abstracter.Pascaligo
+open Operators.Concrete_to_imperative.Pascaligo
 
 let r_split = Location.r_split
 
@@ -229,9 +229,9 @@ let return_statement expr = ok @@ fun expr'_opt ->
   | Some expr' -> ok @@ e_sequence expr expr'
 
 
-let rec abstr_type_expression (t:Raw.type_expr) : type_expression result =
+let rec compile_type_expression (t:Raw.type_expr) : type_expression result =
   match t with
-    TPar x -> abstr_type_expression x.value.inside
+    TPar x -> compile_type_expression x.value.inside
   | TVar v -> (
       match type_constants v.value with
       | Ok (s,_) -> ok @@ make_t @@ T_constant s
@@ -240,25 +240,25 @@ let rec abstr_type_expression (t:Raw.type_expr) : type_expression result =
   | TFun x -> (
       let%bind (a , b) =
         let (a , _ , b) = x.value in
-        bind_map_pair abstr_type_expression (a , b) in
+        bind_map_pair compile_type_expression (a , b) in
       ok @@ make_t @@ T_arrow {type1=a;type2=b}
     )
   | TApp x ->
       let (name, tuple) = x.value in
       let lst = npseq_to_list tuple.value.inside in
       let%bind lst =
-        bind_list @@ List.map abstr_type_expression lst in (** TODO: fix constant and operator*)
+        bind_list @@ List.map compile_type_expression lst in (** TODO: fix constant and operator*)
       let%bind cst =
         trace (unknown_predefined_type name) @@
         type_operators name.value in
       t_operator cst lst
   | TProd p ->
-      let%bind tpl = abstr_list_type_expression
+      let%bind tpl = compile_list_type_expression
     @@ npseq_to_list p.value in
       ok tpl
   | TRecord r ->
       let aux = fun (x, y) ->
-        let%bind y = abstr_type_expression y in
+        let%bind y = compile_type_expression y in
         ok (x, y)
       in
       let apply =
@@ -276,7 +276,7 @@ let rec abstr_type_expression (t:Raw.type_expr) : type_expression result =
             None -> []
           | Some (_, TProd product) -> npseq_to_list product.value
           | Some (_, t_expr) -> [t_expr] in
-        let%bind te = abstr_list_type_expression @@ args in
+        let%bind te = compile_list_type_expression @@ args in
         ok (v.value.constr.value, te)
       in
       let%bind lst = bind_list
@@ -285,15 +285,15 @@ let rec abstr_type_expression (t:Raw.type_expr) : type_expression result =
       let m = List.fold_left (fun m (x, y) -> CMap.add (Constructor x) y m) CMap.empty lst in
       ok @@ make_t @@ T_sum m
 
-and abstr_list_type_expression (lst:Raw.type_expr list) : type_expression result =
+and compile_list_type_expression (lst:Raw.type_expr list) : type_expression result =
   match lst with
   | [] -> ok @@ t_unit
-  | [hd] -> abstr_type_expression hd
+  | [hd] -> compile_type_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map abstr_type_expression lst in
+      let%bind lst = bind_list @@ List.map compile_type_expression lst in
       ok @@ t_tuple lst
 
-let abstr_projection : Raw.projection Region.reg -> _ = fun p ->
+let compile_projection : Raw.projection Region.reg -> _ = fun p ->
   let (p' , loc) = r_split p in
   let var =
     let name = Var.of_name p'.struct_name.value in
@@ -309,13 +309,13 @@ let abstr_projection : Raw.projection Region.reg -> _ = fun p ->
   ok @@ List.fold_left (e_accessor ~loc) var path'
 
 
-let rec abstr_expression (t:Raw.expr) : expr result =
+let rec compile_expression (t:Raw.expr) : expr result =
   let return x = ok x in
   match t with
   | EAnnot a -> (
       let ((expr , type_expr) , loc) = r_split a in
-      let%bind expr' = abstr_expression expr in
-      let%bind type_expr' = abstr_type_expression type_expr in
+      let%bind expr' = compile_expression expr in
+      let%bind type_expr' = compile_type_expression type_expr in
       return @@ e_annotation ~loc expr' type_expr'
     )
   | EVar c -> (
@@ -333,19 +333,19 @@ let rec abstr_expression (t:Raw.expr) : expr result =
         let (f_name , f_loc) = r_split name in
         match constants f_name with
         | Error _ ->
-           let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
+           let%bind arg = compile_tuple_expression ~loc:args_loc args' in
            return @@ e_application ~loc (e_variable ~loc:f_loc (Var.of_name f_name)) arg
         | Ok (s,_) ->
-           let%bind lst = bind_map_list abstr_expression args' in
+           let%bind lst = bind_map_list compile_expression args' in
            return @@ e_constant ~loc s lst
       )
       | f -> (
-        let%bind f' = abstr_expression f in
-        let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
+        let%bind f' = compile_expression f in
+        let%bind arg = compile_tuple_expression ~loc:args_loc args' in
         return @@ e_application ~loc f' arg
       )
     )
-  | EPar x -> abstr_expression x.value.inside
+  | EPar x -> compile_expression x.value.inside
   | EUnit reg ->
     let loc = Location.lift reg in
     return @@ e_literal ~loc Literal_unit
@@ -354,16 +354,16 @@ let rec abstr_expression (t:Raw.expr) : expr result =
     return @@ e_literal ~loc (Literal_bytes (Hex.to_bytes @@ snd x'))
   | ETuple tpl ->
       let (tpl' , loc) = r_split tpl in
-      abstr_tuple_expression ~loc @@ npseq_to_list tpl'.inside
+      compile_tuple_expression ~loc @@ npseq_to_list tpl'.inside
   | ERecord r ->
       let%bind fields = bind_list
-        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = abstr_expression v in ok (k.value, v))
+        @@ List.map (fun ((k : _ Raw.reg), v) -> let%bind v = compile_expression v in ok (k.value, v))
         @@ List.map (fun (x:Raw.field_assign Raw.reg) -> (x.value.field_name, x.value.field_expr))
         @@ npseq_to_list r.value.ne_elements in
       let aux prev (k, v) = SMap.add k v prev in
       return @@ e_record (List.fold_left aux SMap.empty fields)
-  | EProj p -> abstr_projection p
-  | EUpdate u -> abstr_update u
+  | EProj p -> compile_projection p
+  | EUpdate u -> compile_update u
   | EConstr (ConstrApp c) -> (
       let ((c, args) , loc) = r_split c in
       match args with
@@ -372,7 +372,7 @@ let rec abstr_expression (t:Raw.expr) : expr result =
       | Some args ->
           let args, args_loc = r_split args in
           let%bind arg =
-            abstr_tuple_expression ~loc:args_loc
+            compile_tuple_expression ~loc:args_loc
             @@ npseq_to_list args.inside in
           return @@ e_constructor ~loc c.value arg
     )
@@ -380,7 +380,7 @@ let rec abstr_expression (t:Raw.expr) : expr result =
       let ((_, args) , loc) = r_split a in
       let (args , args_loc) = r_split args in
       let%bind arg =
-        abstr_tuple_expression ~loc:args_loc
+        compile_tuple_expression ~loc:args_loc
         @@ npseq_to_list args.inside in
       return @@ e_constant ~loc C_SOME [arg]
   | EConstr (NoneExpr reg) -> (
@@ -388,15 +388,15 @@ let rec abstr_expression (t:Raw.expr) : expr result =
       return @@ e_none ~loc ()
     )
   | EArith (Add c) ->
-      abstr_binop "ADD" c
+      compile_binop "ADD" c
   | EArith (Sub c) ->
-      abstr_binop "SUB" c
+      compile_binop "SUB" c
   | EArith (Mult c) ->
-      abstr_binop "TIMES" c
+      compile_binop "TIMES" c
   | EArith (Div c) ->
-      abstr_binop "DIV" c
+      compile_binop "DIV" c
   | EArith (Mod c) ->
-      abstr_binop "MOD" c
+      compile_binop "MOD" c
   | EArith (Int n) -> (
       let (n , loc) = r_split n in
       let n = Z.to_int @@ snd n in
@@ -412,7 +412,7 @@ let rec abstr_expression (t:Raw.expr) : expr result =
     let n = Z.to_int @@ snd @@ n in
     return @@ e_literal ~loc (Literal_mutez n)
   )
-  | EArith (Neg e) -> abstr_unop "NEG" e
+  | EArith (Neg e) -> compile_unop "NEG" e
   | EString (String s) ->
     let (s , loc) = r_split s in
       let s' =
@@ -422,17 +422,17 @@ let rec abstr_expression (t:Raw.expr) : expr result =
       return @@ e_literal ~loc (Literal_string s')
   | EString (Cat bo) ->
     let (bo , loc) = r_split bo in
-    let%bind sl = abstr_expression bo.arg1 in
-    let%bind sr = abstr_expression bo.arg2 in
+    let%bind sl = compile_expression bo.arg1 in
+    let%bind sr = compile_expression bo.arg2 in
     return @@ e_string_cat ~loc sl sr
-  | ELogic l -> abstr_logic_expression l
-  | EList l -> abstr_list_expression l
-  | ESet s -> abstr_set_expression s
+  | ELogic l -> compile_logic_expression l
+  | EList l -> compile_list_expression l
+  | ESet s -> compile_set_expression s
   | ECond c ->
       let (c , loc) = r_split c in
-      let%bind expr = abstr_expression c.test in
-      let%bind match_true = abstr_expression c.ifso in
-      let%bind match_false = abstr_expression c.ifnot in
+      let%bind expr = compile_expression c.test in
+      let%bind match_true = compile_expression c.ifso in
+      let%bind match_false = compile_expression c.ifnot in
       let match_expr = e_matching expr ~loc (Match_bool {match_true; match_false}) in
       let env = Var.fresh () in
       let%bind (_, match_expr) = repair_mutable_variable_in_matching match_expr [] env in
@@ -440,16 +440,16 @@ let rec abstr_expression (t:Raw.expr) : expr result =
 
   | ECase c -> (
       let (c , loc) = r_split c in
-      let%bind e = abstr_expression c.expr in
+      let%bind e = compile_expression c.expr in
       let%bind lst =
         let aux (x : Raw.expr Raw.case_clause) =
-          let%bind expr = abstr_expression x.rhs in
+          let%bind expr = compile_expression x.rhs in
           ok (x.pattern, expr) in
         bind_list
         @@ List.map aux
         @@ List.map get_value
         @@ npseq_to_list c.cases.value in
-      let%bind cases = abstr_cases lst in
+      let%bind cases = compile_cases lst in
       let match_expr = e_matching ~loc e cases in
       let env = Var.fresh () in
       let%bind (_, match_expr) = repair_mutable_variable_in_matching match_expr [] env in
@@ -461,8 +461,8 @@ let rec abstr_expression (t:Raw.expr) : expr result =
         let lst = List.map get_value @@ pseq_to_list mi.elements in
         let aux : Raw.binding -> (expression * expression) result =
           fun b ->
-            let%bind src = abstr_expression b.source in
-            let%bind dst = abstr_expression b.image in
+            let%bind src = compile_expression b.source in
+            let%bind dst = compile_expression b.image in
             ok (src, dst) in
         bind_map_list aux lst in
       return @@ e_map ~loc lst
@@ -473,8 +473,8 @@ let rec abstr_expression (t:Raw.expr) : expr result =
         let lst = List.map get_value @@ pseq_to_list mi.elements in
         let aux : Raw.binding -> (expression * expression) result =
           fun b ->
-            let%bind src = abstr_expression b.source in
-            let%bind dst = abstr_expression b.image in
+            let%bind src = compile_expression b.source in
+            let%bind dst = compile_expression b.image in
             ok (src, dst) in
         bind_map_list aux lst in
       return @@ e_big_map ~loc lst
@@ -486,20 +486,20 @@ let rec abstr_expression (t:Raw.expr) : expr result =
             let (v , loc) = r_split v in
             return @@ e_variable ~loc (Var.of_name v)
           )
-        | Path p -> abstr_projection p
+        | Path p -> compile_projection p
       in
-      let%bind index = abstr_expression lu.index.value.inside in
+      let%bind index = compile_expression lu.index.value.inside in
       return @@ e_look_up ~loc path index
     )
   | EFun f ->
     let (f , loc) = r_split f in
-    let%bind (_ty_opt, f') = abstr_fun_expression ~loc f
+    let%bind (_ty_opt, f') = compile_fun_expression ~loc f
     in return @@ f'
 
 
-and abstr_update = fun (u:Raw.update Region.reg) ->
+and compile_update = fun (u:Raw.update Region.reg) ->
   let (u, loc) = r_split u in
-  let (name, path) = abstr_path u.record in
+  let (name, path) = compile_path u.record in
   let record = match path with
   | [] -> e_variable (Var.of_name name)
   | _ -> e_accessor_list (e_variable (Var.of_name name)) path in 
@@ -507,7 +507,7 @@ and abstr_update = fun (u:Raw.update Region.reg) ->
   let%bind updates' =
     let aux (f:Raw.field_path_assign Raw.reg) =
       let (f,_) = r_split f in
-      let%bind expr = abstr_expression f.field_expr in
+      let%bind expr = compile_expression f.field_expr in
         ok ( List.map (fun (x: _ Raw.reg) -> x.value) (npseq_to_list f.field_path), expr)
     in
     bind_map_list aux @@ npseq_to_list updates
@@ -523,7 +523,7 @@ and abstr_update = fun (u:Raw.update Region.reg) ->
     aux ur path in
   bind_fold_list aux record updates'
 
-and abstr_logic_expression (t:Raw.logic_expr) : expression result =
+and compile_logic_expression (t:Raw.logic_expr) : expression result =
   let return x = ok x in
   match t with
   | BoolExpr (False reg) -> (
@@ -535,92 +535,92 @@ and abstr_logic_expression (t:Raw.logic_expr) : expression result =
       return @@ e_literal ~loc (Literal_bool true)
     )
   | BoolExpr (Or b) ->
-      abstr_binop "OR" b
+      compile_binop "OR" b
   | BoolExpr (And b) ->
-      abstr_binop "AND" b
+      compile_binop "AND" b
   | BoolExpr (Not b) ->
-      abstr_unop "NOT" b
+      compile_unop "NOT" b
   | CompExpr (Lt c) ->
-      abstr_binop "LT" c
+      compile_binop "LT" c
   | CompExpr (Gt c) ->
-      abstr_binop "GT" c
+      compile_binop "GT" c
   | CompExpr (Leq c) ->
-      abstr_binop "LE" c
+      compile_binop "LE" c
   | CompExpr (Geq c) ->
-      abstr_binop "GE" c
+      compile_binop "GE" c
   | CompExpr (Equal c) ->
-      abstr_binop "EQ" c
+      compile_binop "EQ" c
   | CompExpr (Neq c) ->
-      abstr_binop "NEQ" c
+      compile_binop "NEQ" c
 
-and abstr_list_expression (t:Raw.list_expr) : expression result =
+and compile_list_expression (t:Raw.list_expr) : expression result =
   let return x = ok x in
   match t with
     ECons c ->
-      abstr_binop "CONS" c
+      compile_binop "CONS" c
   | EListComp lst ->
       let (lst , loc) = r_split lst in
       let%bind lst' =
-        bind_map_list abstr_expression @@
+        bind_map_list compile_expression @@
         pseq_to_list lst.elements in
       return @@ e_list ~loc lst'
   | ENil reg ->
       let loc = Location.lift reg in
       return @@ e_list ~loc []
 
-and abstr_set_expression (t:Raw.set_expr) : expression result =
+and compile_set_expression (t:Raw.set_expr) : expression result =
   match t with
   | SetMem x -> (
     let (x' , loc) = r_split x in
-    let%bind set' = abstr_expression x'.set in
-    let%bind element' = abstr_expression x'.element in
+    let%bind set' = compile_expression x'.set in
+    let%bind element' = compile_expression x'.element in
     ok @@ e_constant ~loc C_SET_MEM [ element' ; set' ]
   )
   | SetInj x -> (
     let (x' , loc) = r_split x in
     let elements = pseq_to_list x'.elements in
-    let%bind elements' = bind_map_list abstr_expression elements in
+    let%bind elements' = bind_map_list compile_expression elements in
     ok @@ e_set ~loc elements'
   )
 
-and abstr_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
+and compile_binop (name:string) (t:_ Raw.bin_op Region.reg) : expression result =
   let return x = ok x in
   let (t , loc) = r_split t in
-  let%bind a = abstr_expression t.arg1 in
-  let%bind b = abstr_expression t.arg2 in
+  let%bind a = compile_expression t.arg1 in
+  let%bind b = compile_expression t.arg2 in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ; b ]
 
-and abstr_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
+and compile_unop (name:string) (t:_ Raw.un_op Region.reg) : expression result =
   let return x = ok x in
   let (t , loc) = r_split t in
-  let%bind a = abstr_expression t.arg in
+  let%bind a = compile_expression t.arg in
   let%bind name = constants name in
   return @@ e_constant ~loc name [ a ]
 
-and abstr_tuple_expression ?loc (lst:Raw.expr list) : expression result =
+and compile_tuple_expression ?loc (lst:Raw.expr list) : expression result =
   let return x = ok x in
   match lst with
   | [] -> return @@ e_literal Literal_unit
-  | [hd] -> abstr_expression hd
+  | [hd] -> compile_expression hd
   | lst ->
-      let%bind lst = bind_list @@ List.map abstr_expression lst
+      let%bind lst = bind_list @@ List.map compile_expression lst
       in return @@ e_tuple ?loc lst
 
-and abstr_data_declaration : Raw.data_decl -> _ result =
+and compile_data_declaration : Raw.data_decl -> _ result =
   fun t ->
   match t with
   | LocalVar x ->
       let (x , loc) = r_split x in
       let name = x.name.value in
-      let%bind t = abstr_type_expression x.var_type in
-      let%bind expression = abstr_expression x.init in
+      let%bind t = compile_type_expression x.var_type in
+      let%bind expression = compile_expression x.init in
       return_let_in ~loc (Var.of_name name, Some t) false false expression
   | LocalConst x ->
       let (x , loc) = r_split x in
       let name = x.name.value in
-      let%bind t = abstr_type_expression x.const_type in
-      let%bind expression = abstr_expression x.init in
+      let%bind t = compile_type_expression x.const_type in
+      let%bind expression = compile_expression x.init in
       let inline =
         match x.attributes with
           None -> false
@@ -630,7 +630,7 @@ and abstr_data_declaration : Raw.data_decl -> _ result =
       in return_let_in ~loc (Var.of_name name, Some t) false inline expression
   | LocalFun f  ->
       let (f , loc) = r_split f in
-      let%bind (binder, expr) = abstr_fun_decl ~loc f in
+      let%bind (binder, expr) = compile_fun_decl ~loc f in
       let inline =
         match f.attributes with
           None -> false
@@ -639,22 +639,22 @@ and abstr_data_declaration : Raw.data_decl -> _ result =
            |> List.exists (fun Region.{value; _} -> value = "\"inline\"")
       in return_let_in ~loc binder false inline expr
 
-and abstr_param :
+and compile_param :
       Raw.param_decl -> (string * type_expression) result =
   fun t ->
   match t with
   | ParamConst c ->
       let c = c.value in
       let param_name = c.var.value in
-      let%bind type_expression = abstr_type_expression c.param_type in
+      let%bind type_expression = compile_type_expression c.param_type in
       ok (param_name , type_expression)
   | ParamVar v ->
       let c = v.value in
       let param_name = c.var.value in
-      let%bind type_expression = abstr_type_expression c.param_type in
+      let%bind type_expression = compile_type_expression c.param_type in
       ok (param_name , type_expression)
 
-and abstr_fun_decl :
+and compile_fun_decl :
       loc:_ -> Raw.fun_decl ->
       ((expression_variable * type_expression option) * expression) result =
   fun ~loc x ->
@@ -674,11 +674,11 @@ and abstr_fun_decl :
   in
   (match param.value.inside with
      a, [] -> (
-       let%bind input = abstr_param a in
+       let%bind input = compile_param a in
        let (binder , input_type) = input in
-       let%bind instructions = abstr_statement_list statements in
-       let%bind result = abstr_expression return in
-       let%bind output_type = abstr_type_expression ret_type in
+       let%bind instructions = compile_statement_list statements in
+       let%bind result = compile_expression return in
+       let%bind output_type = compile_type_expression ret_type in
        let body = instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -699,7 +699,7 @@ and abstr_fun_decl :
        let lst = npseq_to_list lst in
        (* TODO wrong, should be fresh? *)
        let arguments_name = Var.of_name "arguments" in
-       let%bind params = bind_map_list abstr_param lst in
+       let%bind params = bind_map_list compile_param lst in
        let (binder , input_type) =
          let type_expression = t_tuple (List.map snd params) in
          (arguments_name , type_expression) in
@@ -712,9 +712,9 @@ and abstr_fun_decl :
            ass
          in
          bind_list @@ List.mapi aux params in
-       let%bind instructions = abstr_statement_list statements in
-       let%bind result = abstr_expression return in
-       let%bind output_type = abstr_type_expression ret_type in
+       let%bind instructions = compile_statement_list statements in
+       let%bind result = compile_expression return in
+       let%bind output_type = compile_type_expression ret_type in
        let body = tpl_declarations @ instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -732,7 +732,7 @@ and abstr_fun_decl :
      )
   )
 
-and abstr_fun_expression :
+and compile_fun_expression :
   loc:_ -> Raw.fun_expr -> (type_expression option * expression) result =
   fun ~loc x ->
   let open! Raw in
@@ -740,11 +740,11 @@ and abstr_fun_expression :
   let statements = [] in
   (match param.value.inside with
     a, [] -> (
-        let%bind input = abstr_param a in
+        let%bind input = compile_param a in
         let (binder , input_type) = input in
-        let%bind instructions = abstr_statement_list statements in
-        let%bind result = abstr_expression return in
-        let%bind output_type = abstr_type_expression ret_type in
+        let%bind instructions = compile_statement_list statements in
+        let%bind result = compile_expression return in
+        let%bind output_type = compile_type_expression ret_type in
 
         let body = instructions in
         let%bind result =
@@ -763,7 +763,7 @@ and abstr_fun_expression :
        let lst = npseq_to_list lst in
        (* TODO wrong, should be fresh? *)
        let arguments_name = Var.of_name "arguments" in
-       let%bind params = bind_map_list abstr_param lst in
+       let%bind params = bind_map_list compile_param lst in
        let (binder , input_type) =
          let type_expression = t_tuple (List.map snd params) in
          (arguments_name , type_expression) in
@@ -775,9 +775,9 @@ and abstr_fun_expression :
            ass
          in
          bind_list @@ List.mapi aux params in
-       let%bind instructions = abstr_statement_list statements in
-       let%bind result = abstr_expression return in
-       let%bind output_type = abstr_type_expression ret_type in
+       let%bind instructions = compile_statement_list statements in
+       let%bind result = compile_expression return in
+       let%bind output_type = compile_type_expression ret_type in
        let body = tpl_declarations @ instructions in
        let%bind result =
          let aux prec cur = cur (Some prec) in
@@ -792,7 +792,7 @@ and abstr_fun_expression :
      )
   )
 
-and abstr_statement_list statements =
+and compile_statement_list statements =
   let open Raw in
   let rec hook acc = function
     [] -> acc
@@ -814,9 +814,9 @@ and abstr_statement_list statements =
       (* Detached attributes are erased. TODO: Warning. *)
       hook acc statements
   | Instr i :: statements ->
-      hook (abstr_instruction i :: acc) statements
+      hook (compile_instruction i :: acc) statements
   | Data d :: statements ->
-      hook (abstr_data_declaration d :: acc) statements
+      hook (compile_data_declaration d :: acc) statements
   in bind_list @@ hook [] (List.rev statements)
 
 and get_case_variables (t:Raw.pattern) : expression_variable list result = 
@@ -848,7 +848,7 @@ and get_case_variables (t:Raw.pattern) : expression_variable list result =
     | PVar  v -> ok @@ [Var.of_name v.value] 
     | p -> fail @@ unsupported_cst_constr p
 
-and abstr_single_instruction : Raw.instruction -> (_ -> expression result) result =
+and compile_single_instruction : Raw.instruction -> (_ -> expression result) result =
   fun t ->
   match t with
   | ProcCall x -> (
@@ -860,15 +860,15 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let (f_name , f_loc) = r_split name in
       match constants f_name with
       | Error _  ->
-         let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
+         let%bind arg = compile_tuple_expression ~loc:args_loc args' in
          return_statement @@ e_application ~loc (e_variable ~loc:f_loc (Var.of_name f_name)) arg
       | Ok (s,_) ->
-         let%bind lst = bind_map_list abstr_expression args' in
+         let%bind lst = bind_map_list compile_expression args' in
          return_statement @@ e_constant ~loc s lst
     )
     | f -> (
-      let%bind f' = abstr_expression f in
-      let%bind arg = abstr_tuple_expression ~loc:args_loc args' in
+      let%bind f' = compile_expression f in
+      let%bind arg = compile_tuple_expression ~loc:args_loc args' in
       return_statement @@ e_application ~loc f' arg
     )
   )
@@ -877,35 +877,35 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
       return_statement @@ e_skip ~loc ()
     )
   | Loop (While l) ->
-      abstr_while_loop l.value
+      compile_while_loop l.value
   | Loop (For (ForInt fi)) -> (
-      let%bind loop = abstr_for_int fi.value in
+      let%bind loop = compile_for_int fi.value in
       ok loop
   )
   | Loop (For (ForCollect fc)) ->
-      let%bind loop = abstr_for_collect fc.value in
+      let%bind loop = compile_for_collect fc.value in
       ok loop
   | Cond c -> (
       let (c , loc) = r_split c in
-      let%bind expr = abstr_expression c.test in
+      let%bind expr = compile_expression c.test in
       let%bind match_true = match c.ifso with
           ClauseInstr i ->
-            abstr_single_instruction i
+            compile_single_instruction i
         | ClauseBlock b ->
             match b with
               LongBlock {value; _} ->
-                abstr_block value
+                compile_block value
             | ShortBlock {value; _} ->
-                abstr_statements @@ fst value.inside in
+                compile_statements @@ fst value.inside in
       let%bind match_false = match c.ifnot with
           ClauseInstr i ->
-            abstr_single_instruction i
+            compile_single_instruction i
         | ClauseBlock b ->
             match b with
               LongBlock {value; _} ->
-                abstr_block value
+                compile_block value
             | ShortBlock {value; _} ->
-                abstr_statements @@ fst value.inside in
+                compile_statements @@ fst value.inside in
       let env = Var.fresh () in
       
       let%bind match_true' = match_true None in
@@ -929,10 +929,10 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | Assign a -> (
       let (a , loc) = r_split a in
-      let%bind value_expr = abstr_expression a.rhs in
+      let%bind value_expr = compile_expression a.rhs in
       match a.lhs with
         | Path path -> (
-            let (name , path') = abstr_path path in
+            let (name , path') = compile_path path in
             let (let_binder, mut, rhs, inline) = e_assign_with_let ~loc name path' value_expr in
             return_let_in let_binder mut inline rhs
           )
@@ -941,11 +941,11 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
             let%bind (varname,map,path) = match v'.path with
               | Name name -> ok (name.value , e_variable (Var.of_name name.value), [])
               | Path p ->
-                let (name,p') = abstr_path v'.path in
-                let%bind accessor = abstr_projection p in
+                let (name,p') = compile_path v'.path in
+                let%bind accessor = compile_projection p in
                 ok @@ (name , accessor , p')
             in
-            let%bind key_expr = abstr_expression v'.index.value.inside in
+            let%bind key_expr = compile_expression v'.index.value.inside in
             let expr' = e_map_add key_expr value_expr map in
             let (let_binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr' in
             return_let_in let_binder mut inline rhs  
@@ -953,20 +953,20 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | CaseInstr c -> (
       let (c , loc) = r_split c in
-      let%bind expr = abstr_expression c.expr in
+      let%bind expr = compile_expression c.expr in
       let env = Var.fresh () in
       let%bind (fv,cases) =
         let aux fv (x : Raw.if_clause Raw.case_clause Raw.reg) =
           let%bind case_clause =
             match x.value.rhs with
               ClauseInstr i ->
-                abstr_single_instruction i
+                compile_single_instruction i
             | ClauseBlock b ->
                 match b with
                   LongBlock {value; _} ->
-                    abstr_block value
+                    compile_block value
                 | ShortBlock {value; _} ->
-                  abstr_statements @@ fst value.inside in
+                  compile_statements @@ fst value.inside in
           let%bind case_clause'= case_clause @@ None in
           let%bind case_clause = case_clause @@ Some(e_variable env) in
           let%bind case_vars   = get_case_variables x.value.pattern in
@@ -976,11 +976,11 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let free_vars = List.concat fv in
       if (List.length free_vars == 0) then (
         let cases = List.map (fun case -> let (a,_,b) = case in (a,b)) cases in
-        let%bind m = abstr_cases cases in
+        let%bind m = compile_cases cases in
         return_statement @@ e_matching ~loc expr m
       ) else (
         let cases = List.map (fun case -> let (a,b,_) = case in (a,b)) cases in
-        let%bind m = abstr_cases cases in
+        let%bind m = compile_cases cases in
         let match_expr = e_matching ~loc expr m in
         let return_expr = fun expr ->
           e_let_in (env,None) false false (store_mutable_variable free_vars) @@
@@ -1002,8 +1002,8 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
         region=r.record_inj.region
         } in
       let u : Raw.update = {record=r.path;kwd_with=r.kwd_with; updates=update} in
-      let%bind expr = abstr_update {value=u;region=reg} in
-      let (name , access_path) = abstr_path r.path in
+      let%bind expr = compile_update {value=u;region=reg} in
+      let (name , access_path) = compile_path r.path in
       let loc = Some loc in
       let (binder, mut, rhs, inline) = e_assign_with_let ?loc name access_path expr in
       return_let_in binder mut inline rhs
@@ -1011,13 +1011,13 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
   )
   | MapPatch patch -> (
       let (map_p, loc) = r_split patch in
-      let (name, access_path) = abstr_path map_p.path in
+      let (name, access_path) = compile_path map_p.path in
       let%bind inj = bind_list
           @@ List.map (fun (x:Raw.binding Region.reg) ->
             let x = x.value in
             let (key, value) = x.source, x.image in
-            let%bind key' = abstr_expression key in
-            let%bind value' = abstr_expression value
+            let%bind key' = compile_expression key in
+            let%bind value' = compile_expression value
             in ok @@ (key', value')
           )
         @@ npseq_to_list map_p.map_inj.value.ne_elements in
@@ -1034,10 +1034,10 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
     )
   | SetPatch patch -> (
       let (setp, loc) = r_split patch in
-      let (name , access_path) = abstr_path setp.path in
+      let (name , access_path) = compile_path setp.path in
       let%bind inj =
         bind_list @@
-        List.map abstr_expression @@
+        List.map compile_expression @@
         npseq_to_list setp.set_inj.value.ne_elements in
       match inj with
       | [] -> return_statement @@ e_skip ~loc ()
@@ -1054,11 +1054,11 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let%bind (varname,map,path) = match v.map with
         | Name v -> ok (v.value , e_variable (Var.of_name v.value) , [])
         | Path p ->
-          let (name,p') = abstr_path v.map in
-          let%bind accessor = abstr_projection p in
+          let (name,p') = compile_path v.map in
+          let%bind accessor = compile_projection p in
           ok @@ (name , accessor , p')
       in
-      let%bind key' = abstr_expression key in
+      let%bind key' = compile_expression key in
       let expr = e_constant ~loc C_MAP_REMOVE [key' ; map] in
       let (binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr in
       return_let_in binder mut inline rhs
@@ -1068,17 +1068,17 @@ and abstr_single_instruction : Raw.instruction -> (_ -> expression result) resul
       let%bind (varname, set, path) = match set_rm.set with
         | Name v -> ok (v.value, e_variable (Var.of_name v.value), [])
         | Path path ->
-          let(name, p') = abstr_path set_rm.set in
-          let%bind accessor = abstr_projection path in
+          let(name, p') = compile_path set_rm.set in
+          let%bind accessor = compile_projection path in
           ok @@ (name, accessor, p')
       in
-      let%bind removed' = abstr_expression set_rm.element in
+      let%bind removed' = compile_expression set_rm.element in
       let expr = e_constant ~loc C_SET_REMOVE [removed' ; set] in
       let (binder, mut, rhs, inline) = e_assign_with_let ~loc varname path expr in
       return_let_in binder mut inline rhs
     )
 
-and abstr_path : Raw.path -> string * string list = fun p ->
+and compile_path : Raw.path -> string * string list = fun p ->
   match p with
   | Raw.Name v -> (v.value , [])
   | Raw.Path p -> (
@@ -1095,7 +1095,7 @@ and abstr_path : Raw.path -> string * string list = fun p ->
       (var , path')
     )
 
-and abstr_cases : (Raw.pattern * expression) list -> matching_expr result = fun t ->
+and compile_cases : (Raw.pattern * expression) list -> matching_expr result = fun t ->
   let open Raw in
   let get_var (t:Raw.pattern) =
     match t with
@@ -1186,13 +1186,13 @@ and abstr_cases : (Raw.pattern * expression) list -> matching_expr result = fun
         bind_map_list aux lst in
       ok @@ ez_match_variant constrs
 
-and abstr_instruction : Raw.instruction -> (_ -> expression result) result =
-  fun t -> trace (abstracting_instruction t) @@ abstr_single_instruction t
+and compile_instruction : Raw.instruction -> (_ -> expression result) result =
+  fun t -> trace (abstracting_instruction t) @@ compile_single_instruction t
 
-and abstr_statements : Raw.statements -> (_ -> expression result) result =
+and compile_statements : Raw.statements -> (_ -> expression result) result =
   fun statements ->
     let lst = npseq_to_list statements in
-    let%bind fs = abstr_statement_list lst in
+    let%bind fs = compile_statement_list lst in
     let aux : _ -> (expression option -> expression result) -> _ =
       fun prec cur ->
         let%bind res = cur prec
@@ -1201,19 +1201,19 @@ and abstr_statements : Raw.statements -> (_ -> expression result) result =
            let%bind ret = bind_fold_right_list aux expr' fs in
            ok @@ Option.unopt_exn ret
 
-and abstr_block : Raw.block -> (_ -> expression result) result =
-  fun t -> abstr_statements t.statements
+and compile_block : Raw.block -> (_ -> expression result) result =
+  fun t -> compile_statements t.statements
 
-and abstr_while_loop : Raw.while_loop -> (_ -> expression result) result = fun wl ->
+and compile_while_loop : Raw.while_loop -> (_ -> expression result) result = fun wl ->
   let env_rec = Var.fresh () in
   let binder  = Var.fresh () in
 
-  let%bind cond = abstr_expression wl.cond in
+  let%bind cond = compile_expression wl.cond in
   let ctrl = 
     (e_variable binder)
   in
 
-  let%bind for_body = abstr_block wl.block.value in
+  let%bind for_body = compile_block wl.block.value in
   let%bind for_body = for_body @@ Some( ctrl ) in
   let%bind ((_,captured_name_list),for_body) = repair_mutable_variable_in_loops for_body [] binder in
 
@@ -1238,15 +1238,15 @@ and abstr_while_loop : Raw.while_loop -> (_ -> expression result) result = fun w
   restore_mutable_variable return_expr captured_name_list env_rec 
 
 
-and abstr_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
+and compile_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   let env_rec = Var.fresh () in
   let binder  = Var.fresh () in
   let name = fi.assign.value.name.value in
   let it = Var.of_name name in
   let var = e_variable it in
   (*Make the cond and the step *)
-  let%bind value = abstr_expression fi.assign.value.expr in
-  let%bind bound = abstr_expression fi.bound in
+  let%bind value = compile_expression fi.assign.value.expr in
+  let%bind bound = compile_expression fi.bound in
   let cond = e_annotation (e_constant C_LE [var ; bound]) t_bool in
   let step = e_int 1 in
   let continue_expr = e_constant C_FOLD_CONTINUE [(e_variable binder)] in
@@ -1256,7 +1256,7 @@ and abstr_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
     continue_expr
   in
   (* Modify the body loop*)
-  let%bind for_body = abstr_block fi.block.value in
+  let%bind for_body = compile_block fi.block.value in
   let%bind for_body = for_body @@ Some ctrl in
   let%bind ((_,captured_name_list),for_body) = repair_mutable_variable_in_loops for_body [it] binder in
 
@@ -1286,19 +1286,19 @@ and abstr_for_int : Raw.for_int -> (_ -> expression result) result = fun fi ->
   in
   restore_mutable_variable return_expr captured_name_list env_rec 
 
-and abstr_for_collect : Raw.for_collect -> (_ -> expression result) result = fun fc ->
+and compile_for_collect : Raw.for_collect -> (_ -> expression result) result = fun fc ->
   let binder = Var.of_name "arguments" in
   let%bind element_names = ok @@ match fc.bind_to with
     | Some v -> [Var.of_name fc.var.value;Var.of_name (snd v).value]
     | None -> [Var.of_name fc.var.value] in
   
   let env = Var.fresh () in
-  let%bind for_body = abstr_block fc.block.value in
+  let%bind for_body = compile_block fc.block.value in
   let%bind for_body = for_body @@ Some (e_accessor (e_variable binder) "0") in
   let%bind ((_,free_vars), for_body) = repair_mutable_variable_in_loops for_body element_names binder in
 
   let init_record = store_mutable_variable free_vars in
-  let%bind collect = abstr_expression fc.expr in
+  let%bind collect = compile_expression fc.expr in
   let aux name expr=
     e_let_in (name,None) false false (e_accessor (e_accessor (e_variable binder) "0") (Var.to_name name)) expr
   in
@@ -1320,7 +1320,7 @@ and abstr_for_collect : Raw.for_collect -> (_ -> expression result) result = fun
   in
   restore_mutable_variable fold free_vars env
 
-and abstr_declaration_list declarations : declaration Location.wrap list result =
+and compile_declaration_list declarations : declaration Location.wrap list result =
   let open Raw in
   let rec hook acc = function
     [] -> acc
@@ -1344,16 +1344,16 @@ and abstr_declaration_list declarations : declaration Location.wrap list result
   | TypeDecl decl :: declarations ->
       let decl, loc = r_split decl in
       let {name; type_expr} : Raw.type_decl = decl in
-      let%bind type_expression = abstr_type_expression type_expr in
+      let%bind type_expression = compile_type_expression type_expr in
       let new_decl =
         Declaration_type (Var.of_name name.value, type_expression) in
       let res = Location.wrap ~loc new_decl in
       hook (bind_list_cons res acc) declarations
   | ConstDecl decl :: declarations ->
-      let abstr_const_decl =
+      let compile_const_decl =
         fun {name;const_type; init; attributes} ->
-          let%bind expression = abstr_expression init in
-          let%bind t = abstr_type_expression const_type in
+          let%bind expression = compile_expression init in
+          let%bind t = compile_type_expression const_type in
           let type_annotation = Some t in
           let inline =
             match attributes with
@@ -1366,11 +1366,11 @@ and abstr_declaration_list declarations : declaration Location.wrap list result
               (Var.of_name name.value, type_annotation, inline, expression)
           in ok new_decl in
       let%bind res =
-        bind_map_location abstr_const_decl (Location.lift_region decl)
+        bind_map_location compile_const_decl (Location.lift_region decl)
       in hook (bind_list_cons res acc) declarations
   | FunDecl fun_decl :: declarations ->
       let decl, loc = r_split fun_decl in
-      let%bind ((name, ty_opt), expr) = abstr_fun_decl ~loc decl in
+      let%bind ((name, ty_opt), expr) = compile_fun_decl ~loc decl in
       let inline =
         match fun_decl.value.attributes with
           None -> false
@@ -1383,5 +1383,5 @@ and abstr_declaration_list declarations : declaration Location.wrap list result
       hook (bind_list_cons res acc) declarations
   in hook (ok @@ []) (List.rev declarations)
 
-let abstr_program : Raw.ast -> program result =
-  fun t -> abstr_declaration_list @@ nseq_to_list t.decl
+let compile_program : Raw.ast -> program result =
+  fun t -> compile_declaration_list @@ nseq_to_list t.decl
diff --git a/src/passes/2-abstracter/pascaligo.mli b/src/passes/2-concrete_to_imperative/pascaligo.mli
similarity index 79%
rename from src/passes/2-abstracter/pascaligo.mli
rename to src/passes/2-concrete_to_imperative/pascaligo.mli
index ec68d93c9..cfa945fb9 100644
--- a/src/passes/2-abstracter/pascaligo.mli
+++ b/src/passes/2-concrete_to_imperative/pascaligo.mli
@@ -8,8 +8,8 @@ module SMap = Map.String
 
 (** Convert a concrete PascaLIGO expression AST to the imperative
     expression AST used by the compiler. *)
-val abstr_expression : Raw.expr -> expr result
+val compile_expression : Raw.expr -> expr result
 
 (** Convert a concrete PascaLIGO program AST to the miperative program
     AST used by the compiler. *)
-val abstr_program : Raw.ast -> program result
+val compile_program : Raw.ast -> program result
diff --git a/src/passes/4-Instruction_remover/dune b/src/passes/4-imperative_to_sugar/dune
similarity index 77%
rename from src/passes/4-Instruction_remover/dune
rename to src/passes/4-imperative_to_sugar/dune
index 8b3b3e071..445998b90 100644
--- a/src/passes/4-Instruction_remover/dune
+++ b/src/passes/4-imperative_to_sugar/dune
@@ -1,6 +1,6 @@
 (library
-  (name instruction_remover)
-  (public_name ligo.instruction_remover)
+  (name imperative_to_sugar)
+  (public_name ligo.imperative_to_sugar)
   (libraries
     simple-utils
     ast_imperative
diff --git a/src/passes/4-Instruction_remover/instruction_remover.ml b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
similarity index 53%
rename from src/passes/4-Instruction_remover/instruction_remover.ml
rename to src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
index 7943419c2..3020d9254 100644
--- a/src/passes/4-Instruction_remover/instruction_remover.ml
+++ b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
@@ -2,7 +2,7 @@ module I = Ast_imperative
 module O = Ast_sugar
 open Trace
 
-let rec idle_type_expression : I.type_expression -> O.type_expression result =
+let rec compile_type_expression : I.type_expression -> O.type_expression result =
   fun te ->
   let return te = ok @@ O.make_t te in
   match te.type_content with
@@ -10,7 +10,7 @@ let rec idle_type_expression : I.type_expression -> O.type_expression result =
       let sum = I.CMap.to_kv_list sum in
       let%bind sum = 
         bind_map_list (fun (k,v) ->
-          let%bind v = idle_type_expression v in
+          let%bind v = compile_type_expression v in
           ok @@ (k,v)
         ) sum
       in
@@ -19,168 +19,168 @@ let rec idle_type_expression : I.type_expression -> O.type_expression result =
       let record = I.LMap.to_kv_list record in
       let%bind record = 
         bind_map_list (fun (k,v) ->
-          let%bind v = idle_type_expression v in
+          let%bind v = compile_type_expression v in
           ok @@ (k,v)
         ) record
       in
       return @@ O.T_record (O.LMap.of_list record)
     | I.T_arrow {type1;type2} ->
-      let%bind type1 = idle_type_expression type1 in
-      let%bind type2 = idle_type_expression type2 in
+      let%bind type1 = compile_type_expression type1 in
+      let%bind type2 = compile_type_expression type2 in
       return @@ T_arrow {type1;type2}
     | I.T_variable type_variable -> return @@ T_variable type_variable 
     | I.T_constant type_constant -> return @@ T_constant type_constant
     | I.T_operator type_operator ->
-      let%bind type_operator = idle_type_operator type_operator in
+      let%bind type_operator = compile_type_operator type_operator in
       return @@ T_operator type_operator
 
-and idle_type_operator : I.type_operator -> O.type_operator result =
+and compile_type_operator : I.type_operator -> O.type_operator result =
   fun t_o ->
   match t_o with
     | TC_contract c -> 
-      let%bind c = idle_type_expression c in
+      let%bind c = compile_type_expression c in
       ok @@ O.TC_contract c
     | TC_option o ->
-      let%bind o = idle_type_expression o in
+      let%bind o = compile_type_expression o in
       ok @@ O.TC_option o
     | TC_list l ->
-      let%bind l = idle_type_expression l in
+      let%bind l = compile_type_expression l in
       ok @@ O.TC_list l
     | TC_set s ->
-      let%bind s = idle_type_expression s in
+      let%bind s = compile_type_expression s in
       ok @@ O.TC_set s
     | TC_map (k,v) ->
-      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      let%bind (k,v) = bind_map_pair compile_type_expression (k,v) in
       ok @@ O.TC_map (k,v)
     | TC_big_map (k,v) ->
-      let%bind (k,v) = bind_map_pair idle_type_expression (k,v) in
+      let%bind (k,v) = bind_map_pair compile_type_expression (k,v) in
       ok @@ O.TC_big_map (k,v)
     | TC_arrow (i,o) ->
-      let%bind (i,o) = bind_map_pair idle_type_expression (i,o) in
+      let%bind (i,o) = bind_map_pair compile_type_expression (i,o) in
       ok @@ O.TC_arrow (i,o)
 
-let rec remove_instruction_in_expression : I.expression -> O.expression result =
+let rec compile_expression : I.expression -> O.expression result =
   fun e ->
   let return expr = ok @@ O.make_expr ~loc:e.location expr in
   match e.expression_content with
     | I.E_literal literal   -> return @@ O.E_literal literal
     | I.E_constant {cons_name;arguments} -> 
-      let%bind arguments = bind_map_list remove_instruction_in_expression arguments in
+      let%bind arguments = bind_map_list compile_expression arguments in
       return @@ O.E_constant {cons_name;arguments}
     | I.E_variable name     -> return @@ O.E_variable name
     | I.E_application {expr1;expr2} -> 
-      let%bind expr1 = remove_instruction_in_expression expr1 in
-      let%bind expr2 = remove_instruction_in_expression expr2 in
+      let%bind expr1 = compile_expression expr1 in
+      let%bind expr2 = compile_expression expr2 in
       return @@ O.E_application {expr1; expr2}
     | I.E_lambda lambda ->
-      let%bind lambda = remove_instruction_in_lambda lambda in
+      let%bind lambda = compile_lambda lambda in
       return @@ O.E_lambda lambda
     | I.E_recursive {fun_name;fun_type;lambda} ->
-      let%bind fun_type = idle_type_expression fun_type in
-      let%bind lambda = remove_instruction_in_lambda lambda in
+      let%bind fun_type = compile_type_expression fun_type in
+      let%bind lambda = compile_lambda lambda in
       return @@ O.E_recursive {fun_name;fun_type;lambda}
     | I.E_let_in {let_binder;mut=_;inline;rhs;let_result} ->
       let (binder,ty_opt) = let_binder in
-      let%bind ty_opt = bind_map_option idle_type_expression ty_opt in
-      let%bind rhs = remove_instruction_in_expression rhs in
-      let%bind let_result = remove_instruction_in_expression let_result in
+      let%bind ty_opt = bind_map_option compile_type_expression ty_opt in
+      let%bind rhs = compile_expression rhs in
+      let%bind let_result = compile_expression let_result in
       return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
     | I.E_skip -> return @@ O.E_skip
     | I.E_constructor {constructor;element} ->
-      let%bind element = remove_instruction_in_expression element in
+      let%bind element = compile_expression element in
       return @@ O.E_constructor {constructor;element}
     | I.E_matching {matchee; cases} ->
-      let%bind matchee = remove_instruction_in_expression matchee in
-      let%bind cases   = remove_instruction_in_matching cases in
+      let%bind matchee = compile_expression matchee in
+      let%bind cases   = compile_matching cases in
       return @@ O.E_matching {matchee;cases}
     | I.E_record record ->
       let record = I.LMap.to_kv_list record in
       let%bind record = 
         bind_map_list (fun (k,v) ->
-          let%bind v =remove_instruction_in_expression v in
+          let%bind v =compile_expression v in
           ok @@ (k,v)
         ) record
       in
       return @@ O.E_record (O.LMap.of_list record)
     | I.E_record_accessor {expr;label} ->
-      let%bind expr = remove_instruction_in_expression expr in
+      let%bind expr = compile_expression expr in
       return @@ O.E_record_accessor {expr;label}
     | I.E_record_update {record;path;update} ->
-      let%bind record = remove_instruction_in_expression record in
-      let%bind update = remove_instruction_in_expression update in
+      let%bind record = compile_expression record in
+      let%bind update = compile_expression update in
       return @@ O.E_record_update {record;path;update}
     | I.E_map map ->
       let%bind map = bind_map_list (
-        bind_map_pair remove_instruction_in_expression
+        bind_map_pair compile_expression
       ) map
       in
       return @@ O.E_map map
     | I.E_big_map big_map ->
       let%bind big_map = bind_map_list (
-        bind_map_pair remove_instruction_in_expression
+        bind_map_pair compile_expression
       ) big_map
       in
       return @@ O.E_big_map big_map
     | I.E_list lst ->
-      let%bind lst = bind_map_list remove_instruction_in_expression lst in
+      let%bind lst = bind_map_list compile_expression lst in
       return @@ O.E_list lst
     | I.E_set set ->
-      let%bind set = bind_map_list remove_instruction_in_expression set in
+      let%bind set = bind_map_list compile_expression set in
       return @@ O.E_set set 
     | I.E_look_up look_up ->
-      let%bind look_up = bind_map_pair remove_instruction_in_expression look_up in
+      let%bind look_up = bind_map_pair compile_expression look_up in
       return @@ O.E_look_up look_up
     | I.E_ascription {anno_expr; type_annotation} ->
-      let%bind anno_expr = remove_instruction_in_expression anno_expr in
-      let%bind type_annotation = idle_type_expression type_annotation in
+      let%bind anno_expr = compile_expression anno_expr in
+      let%bind type_annotation = compile_type_expression type_annotation in
       return @@ O.E_ascription {anno_expr; type_annotation}
-and remove_instruction_in_lambda : I.lambda -> O.lambda result =
+and compile_lambda : I.lambda -> O.lambda result =
   fun {binder;input_type;output_type;result}->
-    let%bind input_type = bind_map_option idle_type_expression input_type in
-    let%bind output_type = bind_map_option idle_type_expression output_type in
-    let%bind result = remove_instruction_in_expression result in
+    let%bind input_type = bind_map_option compile_type_expression input_type in
+    let%bind output_type = bind_map_option compile_type_expression output_type in
+    let%bind result = compile_expression result in
     ok @@ O.{binder;input_type;output_type;result}
-and remove_instruction_in_matching : I.matching_expr -> O.matching_expr result =
+and compile_matching : I.matching_expr -> O.matching_expr result =
   fun m -> 
   match m with 
     | I.Match_bool {match_true;match_false} ->
-      let%bind match_true = remove_instruction_in_expression match_true in
-      let%bind match_false = remove_instruction_in_expression match_false in
+      let%bind match_true = compile_expression match_true in
+      let%bind match_false = compile_expression match_false in
       ok @@ O.Match_bool {match_true;match_false}
     | I.Match_list {match_nil;match_cons} ->
-      let%bind match_nil = remove_instruction_in_expression match_nil in
+      let%bind match_nil = compile_expression match_nil in
       let (hd,tl,expr,tv) = match_cons in
-      let%bind expr = remove_instruction_in_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
     | I.Match_option {match_none;match_some} ->
-      let%bind match_none = remove_instruction_in_expression match_none in
+      let%bind match_none = compile_expression match_none in
       let (n,expr,tv) = match_some in
-      let%bind expr = remove_instruction_in_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_option {match_none; match_some=(n,expr,tv)}
     | I.Match_tuple ((lst,expr), tv) ->
-      let%bind expr = remove_instruction_in_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_tuple ((lst,expr), tv)
     | I.Match_variant (lst,tv) ->
       let%bind lst = bind_map_list (
         fun ((c,n),expr) ->
-          let%bind expr = remove_instruction_in_expression expr in
+          let%bind expr = compile_expression expr in
           ok @@ ((c,n),expr)
       ) lst 
       in
       ok @@ O.Match_variant (lst,tv)
  
-let remove_instruction_in_declaration : I.declaration Location.wrap -> _ =
+let compile_declaration : I.declaration Location.wrap -> _ =
   fun {wrap_content=declaration;location} ->
   let return decl = ok @@ Location.wrap ~loc:location decl in
   match declaration with 
   | I.Declaration_constant (n, te_opt, inline, expr) ->
-    let%bind expr = remove_instruction_in_expression expr in
-    let%bind te_opt = bind_map_option idle_type_expression te_opt in
+    let%bind expr = compile_expression expr in
+    let%bind te_opt = bind_map_option compile_type_expression te_opt in
     return @@ O.Declaration_constant (n, te_opt, inline, expr)
   | I.Declaration_type (n, te) ->
-    let%bind te = idle_type_expression te in
+    let%bind te = compile_type_expression te in
     return @@ O.Declaration_type (n,te)
 
-let remove_instruction_in_program : I.program -> O.program result =
+let compile_program : I.program -> O.program result =
   fun p ->
-  bind_map_list remove_instruction_in_declaration p
+  bind_map_list compile_declaration p
diff --git a/src/passes/5-self_ast_complex/dune b/src/passes/5-self_ast_sugar/dune
similarity index 100%
rename from src/passes/5-self_ast_complex/dune
rename to src/passes/5-self_ast_sugar/dune
diff --git a/src/passes/6-simplifier/dune b/src/passes/6-sugar_to_core/dune
similarity index 80%
rename from src/passes/6-simplifier/dune
rename to src/passes/6-sugar_to_core/dune
index 78556f444..4f4bb92e9 100644
--- a/src/passes/6-simplifier/dune
+++ b/src/passes/6-sugar_to_core/dune
@@ -1,6 +1,6 @@
 (library
-  (name simplifier)
-  (public_name ligo.simplifier)
+  (name sugar_to_core)
+  (public_name ligo.sugar_to_core)
   (libraries
     simple-utils
     ast_sugar
diff --git a/src/passes/6-simplifier/simplifier.ml b/src/passes/6-sugar_to_core/sugar_to_core.ml
similarity index 73%
rename from src/passes/6-simplifier/simplifier.ml
rename to src/passes/6-sugar_to_core/sugar_to_core.ml
index 3b70281ee..a5c525526 100644
--- a/src/passes/6-simplifier/simplifier.ml
+++ b/src/passes/6-sugar_to_core/sugar_to_core.ml
@@ -59,129 +59,129 @@ and idle_type_operator : I.type_operator -> O.type_operator result =
       let%bind (i,o) = bind_map_pair idle_type_expression (i,o) in
       ok @@ O.TC_arrow (i,o)
 
-let rec simplify_expression : I.expression -> O.expression result =
+let rec compile_expression : I.expression -> O.expression result =
   fun e ->
   let return expr = ok @@ O.make_expr ~loc:e.location expr in
   match e.expression_content with
     | I.E_literal literal   -> return @@ O.E_literal literal
     | I.E_constant {cons_name;arguments} -> 
-      let%bind arguments = bind_map_list simplify_expression arguments in
+      let%bind arguments = bind_map_list compile_expression arguments in
       return @@ O.E_constant {cons_name;arguments}
     | I.E_variable name     -> return @@ O.E_variable name
     | I.E_application {expr1;expr2} -> 
-      let%bind expr1 = simplify_expression expr1 in
-      let%bind expr2 = simplify_expression expr2 in
+      let%bind expr1 = compile_expression expr1 in
+      let%bind expr2 = compile_expression expr2 in
       return @@ O.E_application {expr1; expr2}
     | I.E_lambda lambda ->
-      let%bind lambda = simplify_lambda lambda in
+      let%bind lambda = compile_lambda lambda in
       return @@ O.E_lambda lambda
     | I.E_recursive {fun_name;fun_type;lambda} ->
       let%bind fun_type = idle_type_expression fun_type in
-      let%bind lambda = simplify_lambda lambda in
+      let%bind lambda = compile_lambda lambda in
       return @@ O.E_recursive {fun_name;fun_type;lambda}
     | I.E_let_in {let_binder;inline;rhs;let_result} ->
       let (binder,ty_opt) = let_binder in
       let%bind ty_opt = bind_map_option idle_type_expression ty_opt in
-      let%bind rhs = simplify_expression rhs in
-      let%bind let_result = simplify_expression let_result in
+      let%bind rhs = compile_expression rhs in
+      let%bind let_result = compile_expression let_result in
       return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
     | I.E_skip -> return @@ O.E_skip
     | I.E_constructor {constructor;element} ->
-      let%bind element = simplify_expression element in
+      let%bind element = compile_expression element in
       return @@ O.E_constructor {constructor;element}
     | I.E_matching {matchee; cases} ->
-      let%bind matchee = simplify_expression matchee in
-      let%bind cases   = simplify_matching cases in
+      let%bind matchee = compile_expression matchee in
+      let%bind cases   = compile_matching cases in
       return @@ O.E_matching {matchee;cases}
     | I.E_record record ->
       let record = I.LMap.to_kv_list record in
       let%bind record = 
         bind_map_list (fun (k,v) ->
-          let%bind v =simplify_expression v in
+          let%bind v =compile_expression v in
           ok @@ (k,v)
         ) record
       in
       return @@ O.E_record (O.LMap.of_list record)
     | I.E_record_accessor {expr;label} ->
-      let%bind expr = simplify_expression expr in
+      let%bind expr = compile_expression expr in
       return @@ O.E_record_accessor {expr;label}
     | I.E_record_update {record;path;update} ->
-      let%bind record = simplify_expression record in
-      let%bind update = simplify_expression update in
+      let%bind record = compile_expression record in
+      let%bind update = compile_expression update in
       return @@ O.E_record_update {record;path;update}
     | I.E_map map ->
       let%bind map = bind_map_list (
-        bind_map_pair simplify_expression
+        bind_map_pair compile_expression
       ) map
       in
       return @@ O.E_map map
     | I.E_big_map big_map ->
       let%bind big_map = bind_map_list (
-        bind_map_pair simplify_expression
+        bind_map_pair compile_expression
       ) big_map
       in
       return @@ O.E_big_map big_map
     | I.E_list lst ->
-      let%bind lst = bind_map_list simplify_expression lst in
+      let%bind lst = bind_map_list compile_expression lst in
       return @@ O.E_list lst
     | I.E_set set ->
-      let%bind set = bind_map_list simplify_expression set in
+      let%bind set = bind_map_list compile_expression set in
       return @@ O.E_set set 
     | I.E_look_up look_up ->
-      let%bind look_up = bind_map_pair simplify_expression look_up in
+      let%bind look_up = bind_map_pair compile_expression look_up in
       return @@ O.E_look_up look_up
     | I.E_ascription {anno_expr; type_annotation} ->
-      let%bind anno_expr = simplify_expression anno_expr in
+      let%bind anno_expr = compile_expression anno_expr in
       let%bind type_annotation = idle_type_expression type_annotation in
       return @@ O.E_ascription {anno_expr; type_annotation}
 
-and simplify_lambda : I.lambda -> O.lambda result =
+and compile_lambda : I.lambda -> O.lambda result =
   fun {binder;input_type;output_type;result}->
     let%bind input_type = bind_map_option idle_type_expression input_type in
     let%bind output_type = bind_map_option idle_type_expression output_type in
-    let%bind result = simplify_expression result in
+    let%bind result = compile_expression result in
     ok @@ O.{binder;input_type;output_type;result}
-and simplify_matching : I.matching_expr -> O.matching_expr result =
+and compile_matching : I.matching_expr -> O.matching_expr result =
   fun m -> 
   match m with 
     | I.Match_bool {match_true;match_false} ->
-      let%bind match_true = simplify_expression match_true in
-      let%bind match_false = simplify_expression match_false in
+      let%bind match_true = compile_expression match_true in
+      let%bind match_false = compile_expression match_false in
       ok @@ O.Match_bool {match_true;match_false}
     | I.Match_list {match_nil;match_cons} ->
-      let%bind match_nil = simplify_expression match_nil in
+      let%bind match_nil = compile_expression match_nil in
       let (hd,tl,expr,tv) = match_cons in
-      let%bind expr = simplify_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
     | I.Match_option {match_none;match_some} ->
-      let%bind match_none = simplify_expression match_none in
+      let%bind match_none = compile_expression match_none in
       let (n,expr,tv) = match_some in
-      let%bind expr = simplify_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_option {match_none; match_some=(n,expr,tv)}
     | I.Match_tuple ((lst,expr), tv) ->
-      let%bind expr = simplify_expression expr in
+      let%bind expr = compile_expression expr in
       ok @@ O.Match_tuple ((lst,expr), tv)
     | I.Match_variant (lst,tv) ->
       let%bind lst = bind_map_list (
         fun ((c,n),expr) ->
-          let%bind expr = simplify_expression expr in
+          let%bind expr = compile_expression expr in
           ok @@ ((c,n),expr)
       ) lst 
       in
       ok @@ O.Match_variant (lst,tv)
  
-let simplify_declaration : I.declaration Location.wrap -> _ =
+let compile_declaration : I.declaration Location.wrap -> _ =
   fun {wrap_content=declaration;location} ->
   let return decl = ok @@ Location.wrap ~loc:location decl in
   match declaration with 
   | I.Declaration_constant (n, te_opt, inline, expr) ->
-    let%bind expr = simplify_expression expr in
+    let%bind expr = compile_expression expr in
     let%bind te_opt = bind_map_option idle_type_expression te_opt in
     return @@ O.Declaration_constant (n, te_opt, inline, expr)
   | I.Declaration_type (n, te) ->
     let%bind te = idle_type_expression te in
     return @@ O.Declaration_type (n,te)
 
-let simplify_program : I.program -> O.program result =
+let compile_program : I.program -> O.program result =
   fun p ->
-  bind_map_list simplify_declaration p
+  bind_map_list compile_declaration p
diff --git a/src/passes/7-self_ast_simplified/dune b/src/passes/7-self_ast_core/dune
similarity index 100%
rename from src/passes/7-self_ast_simplified/dune
rename to src/passes/7-self_ast_core/dune
diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml
index cf6f04e5c..472b67506 100644
--- a/src/passes/operators/operators.ml
+++ b/src/passes/operators/operators.ml
@@ -9,7 +9,7 @@ open Trace
   a new constructor at all those places.
 *)
 
-module Abstracter = struct
+module Concrete_to_imperative = struct
 
   open Ast_imperative
   (*
diff --git a/src/passes/operators/operators.mli b/src/passes/operators/operators.mli
index 1b33bb811..15176ff8c 100644
--- a/src/passes/operators/operators.mli
+++ b/src/passes/operators/operators.mli
@@ -1,5 +1,5 @@
 
-module Abstracter : sig
+module Concrete_to_imperative : sig
  open Ast_imperative
  open Trace
 

From 5a4c0b32fb4133b309717145c3f088fc7815edae Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Tue, 17 Mar 2020 16:04:27 +0100
Subject: [PATCH 39/43] rewrite test suite to compare value from ast_imperative
 instead of ast_core; includes uncompiler fo stage 4 and 6

---
 src/bin/cli.ml                                |   2 +-
 src/main/uncompile/dune                       |   2 +
 src/main/uncompile/uncompile.ml               |   3 +-
 .../imperative_to_sugar.ml                    | 169 ++++++++++++++++++
 src/passes/6-sugar_to_core/sugar_to_core.ml   | 169 ++++++++++++++++++
 src/test/coase_tests.ml                       |   9 +-
 src/test/hash_lock_tests.ml                   |   2 +-
 src/test/id_tests.ml                          |   2 +-
 src/test/integration_tests.ml                 |  65 ++++---
 src/test/multisig_tests.ml                    |   2 +-
 src/test/multisig_v2_tests.ml                 |   4 +-
 src/test/pledge_tests.ml                      |   3 +-
 src/test/replaceable_id_tests.ml              |   3 +-
 src/test/test_helpers.ml                      |  51 ++++--
 src/test/time_lock_repeat_tests.ml            |   2 +-
 src/test/time_lock_tests.ml                   |   3 +-
 src/test/vote_tests.ml                        |  10 +-
 17 files changed, 431 insertions(+), 70 deletions(-)

diff --git a/src/bin/cli.ml b/src/bin/cli.ml
index 950d64549..1c9a60fe1 100644
--- a/src/bin/cli.ml
+++ b/src/bin/cli.ml
@@ -381,7 +381,7 @@ let evaluate_value =
     let%bind compiled          = Compile.Of_mini_c.aggregate_and_compile_expression mini_c exp in
     let%bind options           = Run.make_dry_run_options {predecessor_timestamp ; amount ; balance ; sender ; source } in
     let%bind michelson_output  = Run.run_no_failwith ~options compiled.expr compiled.expr_ty in
-    let%bind core_output = Uncompile.uncompile_typed_program_entry_expression_result typed_prg entry_point michelson_output in
+    let%bind core_output       = Uncompile.uncompile_typed_program_entry_expression_result typed_prg entry_point michelson_output in
     ok @@ Format.asprintf "%a\n" Ast_core.PP.expression core_output
   in
   let term =
diff --git a/src/main/uncompile/dune b/src/main/uncompile/dune
index bf039deb8..8762c6abf 100644
--- a/src/main/uncompile/dune
+++ b/src/main/uncompile/dune
@@ -4,6 +4,8 @@
   (libraries
     simple-utils
     compiler
+    imperative_to_sugar
+    sugar_to_core
     typer_new
     typer
     ast_typed
diff --git a/src/main/uncompile/uncompile.ml b/src/main/uncompile/uncompile.ml
index 6d43fba15..3adf7445e 100644
--- a/src/main/uncompile/uncompile.ml
+++ b/src/main/uncompile/uncompile.ml
@@ -10,7 +10,8 @@ let uncompile_value func_or_expr program entry ex_ty_value =
       ok output_type in
   let%bind mini_c = Compiler.Uncompiler.translate_value ex_ty_value in
   let%bind typed = Transpiler.untranspile mini_c output_type in
-  Typer.untype_expression typed
+  let%bind core  = Typer.untype_expression typed in
+  ok @@ core
 
 let uncompile_typed_program_entry_expression_result program entry ex_ty_value =
   uncompile_value Expression program entry ex_ty_value
diff --git a/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
index 3020d9254..fc30c7e88 100644
--- a/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
+++ b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
@@ -184,3 +184,172 @@ let compile_declaration : I.declaration Location.wrap -> _ =
 let compile_program : I.program -> O.program result =
   fun p ->
   bind_map_list compile_declaration p
+
+(* uncompiling *)
+let rec uncompile_type_expression : O.type_expression -> I.type_expression result =
+  fun te ->
+  let return te = ok @@ I.make_t te in
+  match te.type_content with
+    | O.T_sum sum -> 
+      let sum = I.CMap.to_kv_list sum in
+      let%bind sum = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = uncompile_type_expression v in
+          ok @@ (k,v)
+        ) sum
+      in
+      return @@ I.T_sum (O.CMap.of_list sum)
+    | O.T_record record -> 
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = uncompile_type_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ I.T_record (O.LMap.of_list record)
+    | O.T_arrow {type1;type2} ->
+      let%bind type1 = uncompile_type_expression type1 in
+      let%bind type2 = uncompile_type_expression type2 in
+      return @@ T_arrow {type1;type2}
+    | O.T_variable type_variable -> return @@ T_variable type_variable 
+    | O.T_constant type_constant -> return @@ T_constant type_constant
+    | O.T_operator type_operator ->
+      let%bind type_operator = uncompile_type_operator type_operator in
+      return @@ T_operator type_operator
+
+and uncompile_type_operator : O.type_operator -> I.type_operator result =
+  fun t_o ->
+  match t_o with
+    | TC_contract c -> 
+      let%bind c = uncompile_type_expression c in
+      ok @@ I.TC_contract c
+    | TC_option o ->
+      let%bind o = uncompile_type_expression o in
+      ok @@ I.TC_option o
+    | TC_list l ->
+      let%bind l = uncompile_type_expression l in
+      ok @@ I.TC_list l
+    | TC_set s ->
+      let%bind s = uncompile_type_expression s in
+      ok @@ I.TC_set s
+    | TC_map (k,v) ->
+      let%bind (k,v) = bind_map_pair uncompile_type_expression (k,v) in
+      ok @@ I.TC_map (k,v)
+    | TC_big_map (k,v) ->
+      let%bind (k,v) = bind_map_pair uncompile_type_expression (k,v) in
+      ok @@ I.TC_big_map (k,v)
+    | TC_arrow (i,o) ->
+      let%bind (i,o) = bind_map_pair uncompile_type_expression (i,o) in
+      ok @@ I.TC_arrow (i,o)
+
+let rec uncompile_expression : O.expression -> I.expression result =
+  fun e ->
+  let return expr = ok @@ I.make_expr ~loc:e.location expr in
+  match e.expression_content with 
+    O.E_literal lit -> return @@ I.E_literal lit
+  | O.E_constant {cons_name;arguments} -> 
+    let%bind arguments = bind_map_list uncompile_expression arguments in
+    return @@ I.E_constant {cons_name;arguments}
+  | O.E_variable name     -> return @@ I.E_variable name
+  | O.E_application {expr1;expr2} -> 
+    let%bind expr1 = uncompile_expression expr1 in
+    let%bind expr2 = uncompile_expression expr2 in
+    return @@ I.E_application {expr1; expr2}
+  | O.E_lambda lambda ->
+    let%bind lambda = uncompile_lambda lambda in
+    return @@ I.E_lambda lambda
+  | O.E_recursive {fun_name;fun_type;lambda} ->
+    let%bind fun_type = uncompile_type_expression fun_type in
+    let%bind lambda = uncompile_lambda lambda in
+    return @@ I.E_recursive {fun_name;fun_type;lambda}
+  | O.E_let_in {let_binder;inline;rhs;let_result} ->
+    let (binder,ty_opt) = let_binder in
+    let%bind ty_opt = bind_map_option uncompile_type_expression ty_opt in
+    let%bind rhs = uncompile_expression rhs in
+    let%bind let_result = uncompile_expression let_result in
+    return @@ I.E_let_in {let_binder=(binder,ty_opt);mut=false;inline;rhs;let_result}
+  | O.E_skip -> return @@ I.E_skip
+  | O.E_constructor {constructor;element} ->
+    let%bind element = uncompile_expression element in
+    return @@ I.E_constructor {constructor;element}
+  | O.E_matching {matchee; cases} ->
+    let%bind matchee = uncompile_expression matchee in
+    let%bind cases   = uncompile_matching cases in
+    return @@ I.E_matching {matchee;cases}
+  | O.E_record record ->
+    let record = I.LMap.to_kv_list record in
+    let%bind record = 
+      bind_map_list (fun (k,v) ->
+        let%bind v = uncompile_expression v in
+        ok @@ (k,v)
+      ) record
+    in
+    return @@ I.E_record (O.LMap.of_list record)
+  | O.E_record_accessor {expr;label} ->
+    let%bind expr = uncompile_expression expr in
+    return @@ I.E_record_accessor {expr;label}
+  | O.E_record_update {record;path;update} ->
+    let%bind record = uncompile_expression record in
+    let%bind update = uncompile_expression update in
+    return @@ I.E_record_update {record;path;update}
+  | O.E_map map ->
+    let%bind map = bind_map_list (
+      bind_map_pair uncompile_expression
+    ) map
+    in
+    return @@ I.E_map map
+  | O.E_big_map big_map ->
+    let%bind big_map = bind_map_list (
+      bind_map_pair uncompile_expression
+    ) big_map
+    in
+    return @@ I.E_big_map big_map
+  | O.E_list lst ->
+    let%bind lst = bind_map_list uncompile_expression lst in
+    return @@ I.E_list lst
+  | O.E_set set ->
+    let%bind set = bind_map_list uncompile_expression set in
+    return @@ I.E_set set 
+  | O.E_look_up look_up ->
+    let%bind look_up = bind_map_pair uncompile_expression look_up in
+    return @@ I.E_look_up look_up
+  | O.E_ascription {anno_expr; type_annotation} ->
+    let%bind anno_expr = uncompile_expression anno_expr in
+    let%bind type_annotation = uncompile_type_expression type_annotation in
+    return @@ I.E_ascription {anno_expr; type_annotation}
+
+and uncompile_lambda : O.lambda -> I.lambda result =
+  fun {binder;input_type;output_type;result}->
+    let%bind input_type = bind_map_option uncompile_type_expression input_type in
+    let%bind output_type = bind_map_option uncompile_type_expression output_type in
+    let%bind result = uncompile_expression result in
+    ok @@ I.{binder;input_type;output_type;result}
+and uncompile_matching : O.matching_expr -> I.matching_expr result =
+  fun m -> 
+  match m with 
+    | O.Match_bool {match_true;match_false} ->
+      let%bind match_true = uncompile_expression match_true in
+      let%bind match_false = uncompile_expression match_false in
+      ok @@ I.Match_bool {match_true;match_false}
+    | O.Match_list {match_nil;match_cons} ->
+      let%bind match_nil = uncompile_expression match_nil in
+      let (hd,tl,expr,tv) = match_cons in
+      let%bind expr = uncompile_expression expr in
+      ok @@ I.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
+    | O.Match_option {match_none;match_some} ->
+      let%bind match_none = uncompile_expression match_none in
+      let (n,expr,tv) = match_some in
+      let%bind expr = uncompile_expression expr in
+      ok @@ I.Match_option {match_none; match_some=(n,expr,tv)}
+    | O.Match_tuple ((lst,expr), tv) ->
+      let%bind expr = uncompile_expression expr in
+      ok @@ O.Match_tuple ((lst,expr), tv)
+    | O.Match_variant (lst,tv) ->
+      let%bind lst = bind_map_list (
+        fun ((c,n),expr) ->
+          let%bind expr = uncompile_expression expr in
+          ok @@ ((c,n),expr)
+      ) lst 
+      in
+      ok @@ I.Match_variant (lst,tv)
diff --git a/src/passes/6-sugar_to_core/sugar_to_core.ml b/src/passes/6-sugar_to_core/sugar_to_core.ml
index a5c525526..b6138ed7f 100644
--- a/src/passes/6-sugar_to_core/sugar_to_core.ml
+++ b/src/passes/6-sugar_to_core/sugar_to_core.ml
@@ -185,3 +185,172 @@ let compile_declaration : I.declaration Location.wrap -> _ =
 let compile_program : I.program -> O.program result =
   fun p ->
   bind_map_list compile_declaration p
+
+(* uncompiling *)
+let rec uncompile_type_expression : O.type_expression -> I.type_expression result =
+  fun te ->
+  let return te = ok @@ I.make_t te in
+  match te.type_content with
+    | O.T_sum sum -> 
+      let sum = I.CMap.to_kv_list sum in
+      let%bind sum = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = uncompile_type_expression v in
+          ok @@ (k,v)
+        ) sum
+      in
+      return @@ I.T_sum (O.CMap.of_list sum)
+    | O.T_record record -> 
+      let record = I.LMap.to_kv_list record in
+      let%bind record = 
+        bind_map_list (fun (k,v) ->
+          let%bind v = uncompile_type_expression v in
+          ok @@ (k,v)
+        ) record
+      in
+      return @@ I.T_record (O.LMap.of_list record)
+    | O.T_arrow {type1;type2} ->
+      let%bind type1 = uncompile_type_expression type1 in
+      let%bind type2 = uncompile_type_expression type2 in
+      return @@ T_arrow {type1;type2}
+    | O.T_variable type_variable -> return @@ T_variable type_variable 
+    | O.T_constant type_constant -> return @@ T_constant type_constant
+    | O.T_operator type_operator ->
+      let%bind type_operator = uncompile_type_operator type_operator in
+      return @@ T_operator type_operator
+
+and uncompile_type_operator : O.type_operator -> I.type_operator result =
+  fun t_o ->
+  match t_o with
+    | TC_contract c -> 
+      let%bind c = uncompile_type_expression c in
+      ok @@ I.TC_contract c
+    | TC_option o ->
+      let%bind o = uncompile_type_expression o in
+      ok @@ I.TC_option o
+    | TC_list l ->
+      let%bind l = uncompile_type_expression l in
+      ok @@ I.TC_list l
+    | TC_set s ->
+      let%bind s = uncompile_type_expression s in
+      ok @@ I.TC_set s
+    | TC_map (k,v) ->
+      let%bind (k,v) = bind_map_pair uncompile_type_expression (k,v) in
+      ok @@ I.TC_map (k,v)
+    | TC_big_map (k,v) ->
+      let%bind (k,v) = bind_map_pair uncompile_type_expression (k,v) in
+      ok @@ I.TC_big_map (k,v)
+    | TC_arrow (i,o) ->
+      let%bind (i,o) = bind_map_pair uncompile_type_expression (i,o) in
+      ok @@ I.TC_arrow (i,o)
+
+let rec uncompile_expression : O.expression -> I.expression result =
+  fun e ->
+  let return expr = ok @@ I.make_expr ~loc:e.location expr in
+  match e.expression_content with 
+    O.E_literal lit -> return @@ I.E_literal lit
+  | O.E_constant {cons_name;arguments} -> 
+    let%bind arguments = bind_map_list uncompile_expression arguments in
+    return @@ I.E_constant {cons_name;arguments}
+  | O.E_variable name     -> return @@ I.E_variable name
+  | O.E_application {expr1;expr2} -> 
+    let%bind expr1 = uncompile_expression expr1 in
+    let%bind expr2 = uncompile_expression expr2 in
+    return @@ I.E_application {expr1; expr2}
+  | O.E_lambda lambda ->
+    let%bind lambda = uncompile_lambda lambda in
+    return @@ I.E_lambda lambda
+  | O.E_recursive {fun_name;fun_type;lambda} ->
+    let%bind fun_type = uncompile_type_expression fun_type in
+    let%bind lambda = uncompile_lambda lambda in
+    return @@ I.E_recursive {fun_name;fun_type;lambda}
+  | O.E_let_in {let_binder;inline;rhs;let_result} ->
+    let (binder,ty_opt) = let_binder in
+    let%bind ty_opt = bind_map_option uncompile_type_expression ty_opt in
+    let%bind rhs = uncompile_expression rhs in
+    let%bind let_result = uncompile_expression let_result in
+    return @@ I.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
+  | O.E_skip -> return @@ I.E_skip
+  | O.E_constructor {constructor;element} ->
+    let%bind element = uncompile_expression element in
+    return @@ I.E_constructor {constructor;element}
+  | O.E_matching {matchee; cases} ->
+    let%bind matchee = uncompile_expression matchee in
+    let%bind cases   = uncompile_matching cases in
+    return @@ I.E_matching {matchee;cases}
+  | O.E_record record ->
+    let record = I.LMap.to_kv_list record in
+    let%bind record = 
+      bind_map_list (fun (k,v) ->
+        let%bind v = uncompile_expression v in
+        ok @@ (k,v)
+      ) record
+    in
+    return @@ I.E_record (O.LMap.of_list record)
+  | O.E_record_accessor {expr;label} ->
+    let%bind expr = uncompile_expression expr in
+    return @@ I.E_record_accessor {expr;label}
+  | O.E_record_update {record;path;update} ->
+    let%bind record = uncompile_expression record in
+    let%bind update = uncompile_expression update in
+    return @@ I.E_record_update {record;path;update}
+  | O.E_map map ->
+    let%bind map = bind_map_list (
+      bind_map_pair uncompile_expression
+    ) map
+    in
+    return @@ I.E_map map
+  | O.E_big_map big_map ->
+    let%bind big_map = bind_map_list (
+      bind_map_pair uncompile_expression
+    ) big_map
+    in
+    return @@ I.E_big_map big_map
+  | O.E_list lst ->
+    let%bind lst = bind_map_list uncompile_expression lst in
+    return @@ I.E_list lst
+  | O.E_set set ->
+    let%bind set = bind_map_list uncompile_expression set in
+    return @@ I.E_set set 
+  | O.E_look_up look_up ->
+    let%bind look_up = bind_map_pair uncompile_expression look_up in
+    return @@ I.E_look_up look_up
+  | O.E_ascription {anno_expr; type_annotation} ->
+    let%bind anno_expr = uncompile_expression anno_expr in
+    let%bind type_annotation = uncompile_type_expression type_annotation in
+    return @@ I.E_ascription {anno_expr; type_annotation}
+
+and uncompile_lambda : O.lambda -> I.lambda result =
+  fun {binder;input_type;output_type;result}->
+    let%bind input_type = bind_map_option uncompile_type_expression input_type in
+    let%bind output_type = bind_map_option uncompile_type_expression output_type in
+    let%bind result = uncompile_expression result in
+    ok @@ I.{binder;input_type;output_type;result}
+and uncompile_matching : O.matching_expr -> I.matching_expr result =
+  fun m -> 
+  match m with 
+    | O.Match_bool {match_true;match_false} ->
+      let%bind match_true = uncompile_expression match_true in
+      let%bind match_false = uncompile_expression match_false in
+      ok @@ I.Match_bool {match_true;match_false}
+    | O.Match_list {match_nil;match_cons} ->
+      let%bind match_nil = uncompile_expression match_nil in
+      let (hd,tl,expr,tv) = match_cons in
+      let%bind expr = uncompile_expression expr in
+      ok @@ I.Match_list {match_nil; match_cons=(hd,tl,expr,tv)}
+    | O.Match_option {match_none;match_some} ->
+      let%bind match_none = uncompile_expression match_none in
+      let (n,expr,tv) = match_some in
+      let%bind expr = uncompile_expression expr in
+      ok @@ I.Match_option {match_none; match_some=(n,expr,tv)}
+    | O.Match_tuple ((lst,expr), tv) ->
+      let%bind expr = uncompile_expression expr in
+      ok @@ O.Match_tuple ((lst,expr), tv)
+    | O.Match_variant (lst,tv) ->
+      let%bind lst = bind_map_list (
+        fun ((c,n),expr) ->
+          let%bind expr = uncompile_expression expr in
+          ok @@ ((c,n),expr)
+      ) lst 
+      in
+      ok @@ I.Match_variant (lst,tv)
diff --git a/src/test/coase_tests.ml b/src/test/coase_tests.ml
index 73520c60e..dcf82891a 100644
--- a/src/test/coase_tests.ml
+++ b/src/test/coase_tests.ml
@@ -27,7 +27,7 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_core
+open Ast_imperative
 
 let card owner =
   e_record_ez [
@@ -220,14 +220,15 @@ let sell () =
       let storage = basic 100 1000 cards (2 * n) in
       e_pair sell_action storage
     in
-    let make_expecter : int -> expression -> unit result = fun n result ->
-      let%bind (ops , storage) = get_e_pair result.expression_content in
+    let make_expecter : int -> Ast_core.expression -> unit result = fun n result ->
+      let%bind (ops , storage) = Ast_core.get_e_pair result.expression_content in
       let%bind () =
-        let%bind lst = get_e_list ops.expression_content in
+        let%bind lst = Ast_core.get_e_list ops.expression_content in
         Assert.assert_list_size lst 1 in
       let expected_storage =
         let cards = List.hds @@ cards_ez first_owner n in
         basic 99 1000 cards (2 * n) in
+      let%bind expected_storage = Test_helpers.expression_to_core expected_storage in
       Ast_core.Misc.assert_value_eq (expected_storage , storage)
     in
     let%bind () =
diff --git a/src/test/hash_lock_tests.ml b/src/test/hash_lock_tests.ml
index d6bfd7aed..e33364cda 100644
--- a/src/test/hash_lock_tests.ml
+++ b/src/test/hash_lock_tests.ml
@@ -1,6 +1,6 @@
 open Trace
 open Test_helpers
-open Ast_core
+open Ast_imperative
 
 let type_file f =
   let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
diff --git a/src/test/id_tests.ml b/src/test/id_tests.ml
index 8632c78e0..4d7a88a6d 100644
--- a/src/test/id_tests.ml
+++ b/src/test/id_tests.ml
@@ -1,6 +1,6 @@
 open Trace
 open Test_helpers
-open Ast_core
+open Ast_imperative
 
 
 let mtype_file f =
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 8b84434ed..2b9bc2ed8 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -1,7 +1,7 @@
 open Trace
 open Test_helpers
 
-open Ast_core.Combinators
+open Ast_imperative.Combinators
 
 let retype_file f =
   let%bind typed,state = Ligo.Compile.Utils.type_file f "reasonligo" Env in
@@ -424,9 +424,9 @@ let bytes_arithmetic () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman" foo in
-  let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program "hasherman" foo in
+  let%bind () = expect_eq_core program "hasherman" foo b1 in
+  let%bind b3 = Test_helpers.run_typed_program_with_imperative_input program "hasherman" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
@@ -434,13 +434,13 @@ let crypto () : unit result =
   let%bind program = type_file "./contracts/crypto.ligo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
-  let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foo in
+  let%bind () = expect_eq_core program "hasherman512" foo b1 in
+  let%bind b2 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
-  let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind b4 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foo in
+  let%bind () = expect_eq_core program "hasherman_blake" foo b4 in
+  let%bind b5 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
@@ -448,13 +448,13 @@ let crypto_mligo () : unit result =
   let%bind program = mtype_file "./contracts/crypto.mligo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
-  let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foo in
+  let%bind () = expect_eq_core program "hasherman512" foo b1 in
+  let%bind b2 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
-  let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind b4 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foo in
+  let%bind () = expect_eq_core program "hasherman_blake" foo b4 in
+  let%bind b5 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
@@ -462,13 +462,13 @@ let crypto_religo () : unit result =
   let%bind program = retype_file "./contracts/crypto.religo" in
   let%bind foo = e_bytes_hex "0f00" in
   let%bind foototo = e_bytes_hex "0f007070" in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foo in
-  let%bind () = expect_eq program "hasherman512" foo b1 in
-  let%bind b2 = Test_helpers.run_typed_program_with_core_input program "hasherman512" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foo in
+  let%bind () = expect_eq_core program "hasherman512" foo b1 in
+  let%bind b2 = Test_helpers.run_typed_program_with_imperative_input program "hasherman512" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b2 , b1) in
-  let%bind b4 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foo in
-  let%bind () = expect_eq program "hasherman_blake" foo b4 in
-  let%bind b5 = Test_helpers.run_typed_program_with_core_input program "hasherman_blake" foototo in
+  let%bind b4 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foo in
+  let%bind () = expect_eq_core program "hasherman_blake" foo b4 in
+  let%bind b5 = Test_helpers.run_typed_program_with_imperative_input program "hasherman_blake" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b5 , b4) in
   ok ()
 
@@ -486,9 +486,9 @@ let bytes_arithmetic_mligo () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program "hasherman" foo in
-  let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program "hasherman" foo in
+  let%bind () = expect_eq_core program "hasherman" foo b1 in
+  let%bind b3 = Test_helpers.run_typed_program_with_imperative_input program "hasherman" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
@@ -506,9 +506,9 @@ let bytes_arithmetic_religo () : unit result =
   let%bind () = expect_eq program "slice_op" tata at in
   let%bind () = expect_fail program "slice_op" foo in
   let%bind () = expect_fail program "slice_op" ba in
-  let%bind b1 = Test_helpers.run_typed_program_with_core_input program"hasherman" foo in
-  let%bind () = expect_eq program "hasherman" foo b1 in
-  let%bind b3 = Test_helpers.run_typed_program_with_core_input program "hasherman" foototo in
+  let%bind b1 = Test_helpers.run_typed_program_with_imperative_input program"hasherman" foo in
+  let%bind () = expect_eq_core program "hasherman" foo b1 in
+  let%bind b3 = Test_helpers.run_typed_program_with_imperative_input program "hasherman" foototo in
   let%bind () = Assert.assert_fail @@ Ast_core.Misc.assert_value_eq (b3 , b1) in
   ok ()
 
@@ -974,7 +974,6 @@ let reoption () : unit result =
 let map_ type_f path : unit result =
   let%bind program = type_f path in
   let ez lst =
-    let open Ast_core.Combinators in
     let lst' = List.map (fun (x, y) -> e_int x, e_int y) lst in
     e_typed_map lst' t_int t_int
   in
@@ -1063,7 +1062,6 @@ let map_ type_f path : unit result =
 let big_map_ type_f path : unit result =
   let%bind program = type_f path in
   let ez lst =
-    let open Ast_core.Combinators in
     let lst' = List.map (fun (x, y) -> e_int x, e_int y) lst in
     (e_typed_big_map lst' t_int t_int)
   in
@@ -1276,7 +1274,6 @@ let loop () : unit result =
     expect_eq program "inner_capture_in_conditional_block"  input expected in
   let%bind () =
     let ez lst =
-      let open Ast_core.Combinators in
       let lst' = List.map (fun (x, y) -> e_string x, e_int y) lst in
         e_typed_map lst' t_string t_int
     in
@@ -2032,11 +2029,11 @@ let get_contract_ligo () : unit result =
   let%bind () =
     let make_input = fun _n -> e_unit () in
     let make_expected : int -> Ast_core.expression -> unit result = fun _n result ->
-      let%bind (ops , storage) = get_e_pair result.expression_content in
+      let%bind (ops , storage) = Ast_core.get_e_pair result.expression_content in
       let%bind () =
-        let%bind lst = get_e_list ops.expression_content in
+        let%bind lst = Ast_core.get_e_list ops.expression_content in
         Assert.assert_list_size lst 1 in
-      let expected_storage = e_unit () in
+      let expected_storage = Ast_core.e_unit () in
       Ast_core.Misc.assert_value_eq (expected_storage , storage)
       in
     let%bind () =
diff --git a/src/test/multisig_tests.ml b/src/test/multisig_tests.ml
index 4410df2eb..948704894 100644
--- a/src/test/multisig_tests.ml
+++ b/src/test/multisig_tests.ml
@@ -28,7 +28,7 @@ let compile_main f s () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_core
+open Ast_imperative
 
 let init_storage threshold counter pkeys =
   let keys = List.map
diff --git a/src/test/multisig_v2_tests.ml b/src/test/multisig_v2_tests.ml
index 0ce171034..8b2b8972b 100644
--- a/src/test/multisig_v2_tests.ml
+++ b/src/test/multisig_v2_tests.ml
@@ -24,7 +24,7 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_core
+open Ast_imperative
 
 let empty_op_list = 
   (e_typed_list [] t_operation)
@@ -33,7 +33,7 @@ let empty_message = e_lambda (Var.of_name "arguments")
   empty_op_list
 let empty_message2 = e_lambda (Var.of_name "arguments")
   (Some t_bytes) (Some (t_list t_operation))
- ( e_let_in ((Var.of_name "foo"),Some t_unit) false (e_unit ()) empty_op_list)
+ ( e_let_in ((Var.of_name "foo"),Some t_unit) false false (e_unit ()) empty_op_list)
 
 let send_param msg = e_constructor "Send" msg
 let withdraw_param = e_constructor "Withdraw" empty_message
diff --git a/src/test/pledge_tests.ml b/src/test/pledge_tests.ml
index f1dc76459..4f6df8a01 100644
--- a/src/test/pledge_tests.ml
+++ b/src/test/pledge_tests.ml
@@ -1,7 +1,6 @@
 open Trace
 open Test_helpers
-open Ast_core
-
+open Ast_imperative
 
 let retype_file f =
   let%bind typed,state = Ligo.Compile.Utils.type_file f "reasonligo" Env in
diff --git a/src/test/replaceable_id_tests.ml b/src/test/replaceable_id_tests.ml
index 67cdd9402..1c634c611 100644
--- a/src/test/replaceable_id_tests.ml
+++ b/src/test/replaceable_id_tests.ml
@@ -23,7 +23,8 @@ let compile_main () =
     (* fails if the given entry point is not a valid contract *)
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
-open Ast_core
+
+open Ast_imperative
 
 let empty_op_list = 
   (e_typed_list [] t_operation)
diff --git a/src/test/test_helpers.ml b/src/test/test_helpers.ml
index fc1227472..ded88c33b 100644
--- a/src/test/test_helpers.ml
+++ b/src/test/test_helpers.ml
@@ -29,15 +29,21 @@ let test name f =
 
 let test_suite name lst = Test_suite (name , lst)
 
+let expression_to_core expression =
+  let%bind sugar = Compile.Of_imperative.compile_expression expression in
+  let%bind core  = Compile.Of_sugar.compile_expression sugar in
+  ok @@ core
 
-open Ast_core
+open Ast_imperative
 
 let pack_payload (program:Ast_typed.program) (payload:expression) : bytes result =
   let%bind code =
     let env = Ast_typed.program_environment program in
 
+    let%bind sugar     = Compile.Of_imperative.compile_expression payload in
+    let%bind core      = Compile.Of_sugar.compile_expression sugar in
     let%bind (typed,_) = Compile.Of_core.compile_expression
-        ~env ~state:(Typer.Solver.initial_state) payload in
+        ~env ~state:(Typer.Solver.initial_state) core in
     let%bind mini_c = Compile.Of_typed.compile_expression typed in
     Compile.Of_mini_c.compile_expression mini_c in
   let (Ex_ty payload_ty) = code.expr_ty in
@@ -77,27 +83,29 @@ let sha_256_hash pl =
   let open Proto_alpha_utils.Memory_proto_alpha.Alpha_environment in
   Raw_hashes.sha256 pl
 
-open Ast_core.Combinators
+open Ast_imperative.Combinators
 
-let typed_program_with_core_input_to_michelson
+let typed_program_with_imperative_input_to_michelson
     (program: Ast_typed.program) (entry_point: string)
-    (input: Ast_core.expression) : Compiler.compiled_expression result =
+    (input: Ast_imperative.expression) : Compiler.compiled_expression result =
   Printexc.record_backtrace true;
   let env = Ast_typed.program_environment program in
   let state = Typer.Solver.initial_state in
-  let%bind app              = Compile.Of_core.apply entry_point input in
+  let%bind sugar            = Compile.Of_imperative.compile_expression input in
+  let%bind core             = Compile.Of_sugar.compile_expression sugar in
+  let%bind app              = Compile.Of_core.apply entry_point core in
   let%bind (typed_app,_)    = Compile.Of_core.compile_expression ~env ~state app in
   let%bind compiled_applied = Compile.Of_typed.compile_expression typed_app in
   let%bind mini_c_prg       = Compile.Of_typed.compile program in
   Compile.Of_mini_c.aggregate_and_compile_expression mini_c_prg compiled_applied
 
-let run_typed_program_with_core_input ?options
+let run_typed_program_with_imperative_input ?options
     (program: Ast_typed.program) (entry_point: string)
-    (input: Ast_core.expression) : Ast_core.expression result =
-  let%bind michelson_program = typed_program_with_core_input_to_michelson program entry_point input in
+    (input: Ast_imperative.expression) : Ast_core.expression result =
+  let%bind michelson_program = typed_program_with_imperative_input_to_michelson program entry_point input in
   let%bind michelson_output  = Ligo.Run.Of_michelson.run_no_failwith ?options michelson_program.expr michelson_program.expr_ty in
   Uncompile.uncompile_typed_program_entry_function_result program entry_point michelson_output
-
+ 
 let expect ?options program entry_point input expecter =
   let%bind result =
     let run_error =
@@ -106,7 +114,7 @@ let expect ?options program entry_point input expecter =
       error title content
     in
     trace run_error @@
-    run_typed_program_with_core_input ?options program entry_point input in
+    run_typed_program_with_imperative_input ?options program entry_point input in
   expecter result
 
 let expect_fail ?options program entry_point input =
@@ -117,10 +125,10 @@ let expect_fail ?options program entry_point input =
   in
   trace run_error @@
   Assert.assert_fail @@
-  run_typed_program_with_core_input ?options program entry_point input
+  run_typed_program_with_imperative_input ?options program entry_point input
 
 let expect_string_failwith ?options program entry_point input expected_failwith =
-  let%bind michelson_program = typed_program_with_core_input_to_michelson program entry_point input in
+  let%bind michelson_program = typed_program_with_imperative_input_to_michelson program entry_point input in
   let%bind err = Ligo.Run.Of_michelson.run_failwith
     ?options michelson_program.expr michelson_program.expr_ty in
   match err with
@@ -128,6 +136,7 @@ let expect_string_failwith ?options program entry_point input expected_failwith
     | _ -> simple_fail "Expected to fail with a string"
 
 let expect_eq ?options program entry_point input expected =
+  let%bind expected = expression_to_core expected in
   let expecter = fun result ->
     let expect_error =
       let title () = "expect result" in
@@ -136,7 +145,19 @@ let expect_eq ?options program entry_point input expected =
           Ast_core.PP.expression result in
       error title content in
     trace expect_error @@
-    Ast_core.Misc.assert_value_eq (expected , result) in
+    Ast_core.Misc.assert_value_eq (expected,result) in
+  expect ?options program entry_point input expecter
+
+let expect_eq_core ?options program entry_point input expected =
+  let expecter = fun result ->
+    let expect_error =
+      let title () = "expect result" in
+      let content () = Format.asprintf "Expected %a, got %a"
+          Ast_core.PP.expression expected
+          Ast_core.PP.expression result in
+      error title content in
+    trace expect_error @@
+    Ast_core.Misc.assert_value_eq (expected,result) in
   expect ?options program entry_point input expecter
 
 let expect_evaluate program entry_point expecter =
@@ -153,6 +174,7 @@ let expect_evaluate program entry_point expecter =
   expecter res_simpl
 
 let expect_eq_evaluate program entry_point expected =
+  let%bind expected  = expression_to_core expected in
   let expecter = fun result ->
     Ast_core.Misc.assert_value_eq (expected , result) in
   expect_evaluate program entry_point expecter
@@ -237,7 +259,6 @@ let expect_eq_n_int a b c =
   expect_eq_n a b e_int (fun n -> e_int (c n))
 
 let expect_eq_b_bool a b c =
-  let open Ast_core.Combinators in
   expect_eq_b a b (fun bool -> e_bool (c bool))
 
 
diff --git a/src/test/time_lock_repeat_tests.ml b/src/test/time_lock_repeat_tests.ml
index f2610dadb..2720cfb64 100644
--- a/src/test/time_lock_repeat_tests.ml
+++ b/src/test/time_lock_repeat_tests.ml
@@ -1,6 +1,6 @@
 open Trace
 open Test_helpers
-open Ast_core
+open Ast_imperative
 
 let type_file f =
   let%bind typed,state = Ligo.Compile.Utils.type_file f "cameligo" (Contract "main") in
diff --git a/src/test/time_lock_tests.ml b/src/test/time_lock_tests.ml
index 37f936a29..e22cb1792 100644
--- a/src/test/time_lock_tests.ml
+++ b/src/test/time_lock_tests.ml
@@ -24,7 +24,8 @@ let compile_main () =
     Ligo.Compile.Of_michelson.build_contract michelson_prg in
   ok ()
 
-open Ast_core
+open Ast_imperative
+
 let empty_op_list =
   (e_typed_list [] t_operation)
 let empty_message = e_lambda (Var.of_name "arguments")
diff --git a/src/test/vote_tests.ml b/src/test/vote_tests.ml
index 1fc2c5cd6..9122eff9e 100644
--- a/src/test/vote_tests.ml
+++ b/src/test/vote_tests.ml
@@ -15,7 +15,7 @@ let get_program =
         ok (program , state)
       )
 
-open Ast_core
+open Ast_imperative
 
 let init_storage name = e_record_ez [
     ("title" , e_string name) ;
@@ -38,14 +38,14 @@ let yea = e_constructor "Vote" (e_constructor "Yea" (e_unit ()))
 let init_vote () =
   let%bind (program , _) = get_program () in
   let%bind result =
-    Test_helpers.run_typed_program_with_core_input
+    Test_helpers.run_typed_program_with_imperative_input
       program "main" (e_pair yea (init_storage "basic")) in
-  let%bind (_, storage) = extract_pair result in
-  let%bind storage' = extract_record storage in
+  let%bind (_, storage) = Ast_core.extract_pair result in
+  let%bind storage' = Ast_core.extract_record storage in
 (*  let votes = List.assoc (Label "voters") storage' in
   let%bind votes' = extract_map votes in *)
   let yea = List.assoc (Label "yea") storage' in
-  let%bind () = Ast_core.Misc.assert_value_eq (yea, e_nat 1) in
+  let%bind () = Ast_core.Misc.assert_value_eq (yea, Ast_core.e_nat 1) in
   ok ()
 
 let main = test_suite "Vote" [

From cb1bc95d5960aefad6975d2e64b7d413035d0b99 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Wed, 18 Mar 2020 16:16:43 +0100
Subject: [PATCH 40/43] remove E_skip from core

---
 src/passes/6-sugar_to_core/sugar_to_core.ml | 3 +--
 src/passes/8-typer-new/typer.ml             | 4 ----
 src/passes/8-typer-old/typer.ml             | 2 +-
 src/stages/3-ast_core/PP.ml                 | 2 --
 src/stages/3-ast_core/combinators.ml        | 1 -
 src/stages/3-ast_core/combinators.mli       | 1 -
 src/stages/3-ast_core/misc.ml               | 2 +-
 src/stages/3-ast_core/types.ml              | 1 -
 src/stages/4-ast_typed/types.ml             | 2 +-
 9 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/passes/6-sugar_to_core/sugar_to_core.ml b/src/passes/6-sugar_to_core/sugar_to_core.ml
index b6138ed7f..c55c2561c 100644
--- a/src/passes/6-sugar_to_core/sugar_to_core.ml
+++ b/src/passes/6-sugar_to_core/sugar_to_core.ml
@@ -85,7 +85,7 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind rhs = compile_expression rhs in
       let%bind let_result = compile_expression let_result in
       return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
-    | I.E_skip -> return @@ O.E_skip
+    | I.E_skip -> ok @@ O.e_unit ~loc:e.location ()
     | I.E_constructor {constructor;element} ->
       let%bind element = compile_expression element in
       return @@ O.E_constructor {constructor;element}
@@ -270,7 +270,6 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind rhs = uncompile_expression rhs in
     let%bind let_result = uncompile_expression let_result in
     return @@ I.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
-  | O.E_skip -> return @@ I.E_skip
   | O.E_constructor {constructor;element} ->
     let%bind element = uncompile_expression element in
     return @@ I.E_constructor {constructor;element}
diff --git a/src/passes/8-typer-new/typer.ml b/src/passes/8-typer-new/typer.ml
index 555ec8ae8..215df7ebd 100644
--- a/src/passes/8-typer-new/typer.ml
+++ b/src/passes/8-typer-new/typer.ml
@@ -446,10 +446,6 @@ and type_expression : environment -> Solver.state -> ?tv_opt:O.type_expression -
   | E_literal (Literal_void) -> (
       failwith "TODO: missing implementation for literal void"
     )
-  | E_skip -> (
-    (* E_skip just returns unit *)
-    return_wrapped (e_unit ()) state @@ Wrap.literal (t_unit ())
-    )
   (* | E_literal (Literal_string s) -> (
    *     L.log (Format.asprintf "literal_string option type: %a" PP_helpers.(option O.PP.type_expression) tv_opt) ;
    *     match Option.map Ast_typed.get_type' tv_opt with
diff --git a/src/passes/8-typer-old/typer.ml b/src/passes/8-typer-old/typer.ml
index 52586508d..bc6924df0 100644
--- a/src/passes/8-typer-old/typer.ml
+++ b/src/passes/8-typer-old/typer.ml
@@ -423,7 +423,7 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
       return (E_variable name) tv'.type_value
   | E_literal (Literal_bool b) ->
       return (E_literal (Literal_bool b)) (t_bool ())
-  | E_literal Literal_unit | E_skip ->
+  | E_literal Literal_unit ->
       return (E_literal (Literal_unit)) (t_unit ())
   | E_literal Literal_void -> return (E_literal (Literal_void)) (t_unit ()) (* TODO : IS this really a t_unit ?*)
   | E_literal (Literal_string s) ->
diff --git a/src/stages/3-ast_core/PP.ml b/src/stages/3-ast_core/PP.ml
index bd1f13ad5..88d4875c5 100644
--- a/src/stages/3-ast_core/PP.ml
+++ b/src/stages/3-ast_core/PP.ml
@@ -58,8 +58,6 @@ and expression_content ppf (ec : expression_content) =
         cases
   | E_let_in { let_binder ;rhs ; let_result; inline } ->    
     fprintf ppf "let %a = %a%a in %a" option_type_name let_binder expression rhs option_inline inline expression let_result
-  | E_skip ->
-      fprintf ppf "skip"
   | E_ascription {anno_expr; type_annotation} ->
       fprintf ppf "%a : %a" expression anno_expr type_expression
         type_annotation
diff --git a/src/stages/3-ast_core/combinators.ml b/src/stages/3-ast_core/combinators.ml
index 9ea3f592c..ac1ee3798 100644
--- a/src/stages/3-ast_core/combinators.ml
+++ b/src/stages/3-ast_core/combinators.ml
@@ -121,7 +121,6 @@ let e_matching_bool ?loc a b c : expression = e_matching ?loc a (Match_bool {mat
 let e_accessor ?loc a b = make_expr ?loc @@ E_record_accessor {expr = a; label= Label b}
 let e_accessor_list ?loc a b  = List.fold_left (fun a b -> e_accessor ?loc a b) a b
 let e_variable ?loc v = make_expr ?loc @@ E_variable v
-let e_skip ?loc () = make_expr ?loc @@ E_skip
 let e_let_in ?loc (binder, ascr) inline rhs let_result = 
   make_expr ?loc @@ E_let_in { let_binder = (binder,ascr) ; rhs ; let_result; inline }
 let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
diff --git a/src/stages/3-ast_core/combinators.mli b/src/stages/3-ast_core/combinators.mli
index e9d3dd144..b962ce3c6 100644
--- a/src/stages/3-ast_core/combinators.mli
+++ b/src/stages/3-ast_core/combinators.mli
@@ -83,7 +83,6 @@ val e_matching_bool : ?loc:Location.t -> expression -> expression -> expression
 val e_accessor : ?loc:Location.t -> expression -> string -> expression
 val e_accessor_list : ?loc:Location.t -> expression -> string list -> expression
 val e_variable : ?loc:Location.t -> expression_variable -> expression
-val e_skip : ?loc:Location.t -> unit -> expression
 val e_sequence : ?loc:Location.t -> expression -> expression -> expression
 val e_cond: ?loc:Location.t -> expression -> expression -> expression -> expression
 val e_let_in : ?loc:Location.t -> ( expression_variable * type_expression option ) -> bool -> expression -> expression -> expression
diff --git a/src/stages/3-ast_core/misc.ml b/src/stages/3-ast_core/misc.ml
index f2094d3ca..a09efa475 100644
--- a/src/stages/3-ast_core/misc.ml
+++ b/src/stages/3-ast_core/misc.ml
@@ -184,7 +184,7 @@ let rec assert_value_eq (a, b: (expression * expression )) : unit result =
   | (E_application _, _) | (E_let_in _, _)
   | (E_recursive _,_) | (E_record_accessor _, _)
   | (E_look_up _, _) | (E_matching _, _)
-  | (E_skip, _) -> simple_fail "comparing not a value"
+   -> simple_fail "comparing not a value"
 
 let is_value_eq (a , b) = to_bool @@ assert_value_eq (a , b)
 
diff --git a/src/stages/3-ast_core/types.ml b/src/stages/3-ast_core/types.ml
index 07a36d361..781214f51 100644
--- a/src/stages/3-ast_core/types.ml
+++ b/src/stages/3-ast_core/types.ml
@@ -36,7 +36,6 @@ and expression_content =
   | E_lambda of lambda
   | E_recursive of recursive
   | E_let_in of let_in
-  | E_skip
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
   | E_matching of matching
diff --git a/src/stages/4-ast_typed/types.ml b/src/stages/4-ast_typed/types.ml
index b5a35061f..a0d7c067a 100644
--- a/src/stages/4-ast_typed/types.ml
+++ b/src/stages/4-ast_typed/types.ml
@@ -40,8 +40,8 @@ and expression_content =
   | E_variable of expression_variable
   | E_application of application
   | E_lambda of lambda
-  | E_let_in of let_in
   | E_recursive of recursive
+  | E_let_in of let_in
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
   | E_matching of matching

From 6cafb4026bef643109ff0b1819311a4c16fb3d94 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Wulfman <pierre.emmanuel.wulfman@gmail.com>
Date: Wed, 18 Mar 2020 17:27:27 +0100
Subject: [PATCH 41/43] adding E_sequence in sugar

---
 src/bin/expect_tests/contract_tests.ml        |  4 +--
 src/main/compile/of_core.ml                   |  2 +-
 src/passes/10-interpreter/interpreter.ml      |  2 +-
 src/passes/10-transpiler/transpiler.ml        | 12 +++----
 src/passes/3-self_ast_imperative/helpers.ml   | 31 +++++++++++++------
 .../imperative_to_sugar.ml                    | 28 +++++++++++------
 src/passes/6-sugar_to_core/sugar_to_core.ml   | 26 ++++++++++------
 src/passes/8-typer-new/typer.ml               | 16 +++++-----
 src/passes/8-typer-old/typer.ml               | 24 +++++++-------
 src/passes/9-self_ast_typed/helpers.ml        | 16 +++++-----
 src/passes/9-self_ast_typed/tail_recursion.ml |  6 ++--
 src/stages/1-ast_imperative/PP.ml             | 10 +++---
 src/stages/1-ast_imperative/combinators.ml    |  4 +--
 src/stages/1-ast_imperative/misc.ml           |  2 +-
 src/stages/1-ast_imperative/types.ml          | 22 ++++++++-----
 src/stages/2-ast_sugar/PP.ml                  | 11 ++++---
 src/stages/2-ast_sugar/combinators.ml         |  4 +--
 src/stages/2-ast_sugar/misc.ml                |  2 +-
 src/stages/2-ast_sugar/types.ml               | 22 ++++++++-----
 src/stages/3-ast_core/PP.ml                   |  4 +--
 src/stages/3-ast_core/combinators.ml          |  3 +-
 src/stages/3-ast_core/combinators.mli         |  1 -
 src/stages/3-ast_core/types.ml                |  5 ++-
 src/stages/4-ast_typed/PP.ml                  |  4 +--
 src/stages/4-ast_typed/combinators.ml         |  2 +-
 src/stages/4-ast_typed/misc.ml                |  2 +-
 src/stages/4-ast_typed/misc_smart.ml          |  4 +--
 src/stages/4-ast_typed/types.ml               |  5 ++-
 src/stages/typesystem/misc.ml                 |  8 ++---
 29 files changed, 167 insertions(+), 115 deletions(-)

diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml
index 3bcb48aa0..3785881be 100644
--- a/src/bin/expect_tests/contract_tests.ml
+++ b/src/bin/expect_tests/contract_tests.ml
@@ -1174,7 +1174,7 @@ let%expect_test _ =
 let%expect_test _ =
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_toplevel.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#812 = #P in let p = rhs#812.0 in let s = rhs#812.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
+ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8, character 8. No free variable allowed in this lambda: variable 'store' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * string ))) : None return let rhs#654 = #P in let p = rhs#654.0 in let s = rhs#654.1 in ( list[] : (TO_list(operation)) , store ) , NONE() : (TO_option(key_hash)) , 300000000mutez , \"un\")","location":"in file \"create_contract_toplevel.mligo\", line 4, character 35 to line 8, character 8"}
 
 
  If you're not sure how to fix this error, you can
@@ -1187,7 +1187,7 @@ ligo: in file "create_contract_toplevel.mligo", line 4, character 35 to line 8,
 
   run_ligo_bad [ "compile-contract" ; bad_contract "create_contract_var.mligo" ; "main" ] ;
   [%expect {|
-ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#815 = #P in let p = rhs#815.0 in let s = rhs#815.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
+ligo: in file "create_contract_var.mligo", line 6, character 35 to line 10, character 5. No free variable allowed in this lambda: variable 'a' {"expression":"CREATE_CONTRACT(lambda (#P:Some(( nat * int ))) : None return let rhs#657 = #P in let p = rhs#657.0 in let s = rhs#657.1 in ( list[] : (TO_list(operation)) , a ) , NONE() : (TO_option(key_hash)) , 300000000mutez , 1)","location":"in file \"create_contract_var.mligo\", line 6, character 35 to line 10, character 5"}
 
 
  If you're not sure how to fix this error, you can
diff --git a/src/main/compile/of_core.ml b/src/main/compile/of_core.ml
index c6c48c299..e6f0dfbba 100644
--- a/src/main/compile/of_core.ml
+++ b/src/main/compile/of_core.ml
@@ -26,7 +26,7 @@ let apply (entry_point : string) (param : Ast_core.expression) : Ast_core.expres
     { expression_content = Ast_core.E_variable name ;
       location = Virtual "generated entry-point variable" } in
   let applied : Ast_core.expression = 
-    { expression_content = Ast_core.E_application {expr1=entry_point_var; expr2=param} ;
+    { expression_content = Ast_core.E_application {lamb=entry_point_var; args=param} ;
       location = Virtual "generated application" } in
   ok applied
 
diff --git a/src/passes/10-interpreter/interpreter.ml b/src/passes/10-interpreter/interpreter.ml
index cdbee239c..1a04d35c4 100644
--- a/src/passes/10-interpreter/interpreter.ml
+++ b/src/passes/10-interpreter/interpreter.ml
@@ -270,7 +270,7 @@ and eval_literal : Ast_typed.literal -> value result = function
 and eval : Ast_typed.expression -> env -> value result
   = fun term env ->
     match term.expression_content with
-    | E_application ({expr1 = f; expr2 = args}) -> (
+    | E_application ({lamb = f; args}) -> (
       let%bind f' = eval f env in
       let%bind args' = eval args env in
       match f' with
diff --git a/src/passes/10-transpiler/transpiler.ml b/src/passes/10-transpiler/transpiler.ml
index 3cf73747e..2d726d2df 100644
--- a/src/passes/10-transpiler/transpiler.ml
+++ b/src/passes/10-transpiler/transpiler.ml
@@ -253,9 +253,9 @@ and transpile_annotated_expression (ae:AST.expression) : expression result =
       let%bind tv = transpile_environment_element_type ele in
       return ~tv @@ E_variable (name)
     )
-  | E_application {expr1;expr2} ->
-      let%bind a = transpile_annotated_expression expr1 in
-      let%bind b = transpile_annotated_expression expr2 in
+  | E_application {lamb; args} ->
+      let%bind a = transpile_annotated_expression lamb in
+      let%bind b = transpile_annotated_expression args in
       return @@ E_application (a, b)
   | E_constructor {constructor;element} -> (
       let%bind param' = transpile_annotated_expression element in
@@ -550,10 +550,10 @@ and transpile_recursive {fun_name; fun_type; lambda} =
       E_matching m -> 
         let%bind ty = transpile_type e.type_expression in
         matching fun_name loop_type shadowed m ty |
-      E_application {expr1;expr2} -> (
-        match expr1.expression_content,shadowed with
+      E_application {lamb;args} -> (
+        match lamb.expression_content,shadowed with
         E_variable name, false when Var.equal fun_name name -> 
-          let%bind expr = transpile_annotated_expression expr2 in
+          let%bind expr = transpile_annotated_expression args in
           ok @@ Expression.make (E_constant {cons_name=C_LOOP_CONTINUE;arguments=[expr]}) loop_type |
         _ -> 
           let%bind expr = transpile_annotated_expression e in
diff --git a/src/passes/3-self_ast_imperative/helpers.ml b/src/passes/3-self_ast_imperative/helpers.ml
index 22e426700..fc15f29e1 100644
--- a/src/passes/3-self_ast_imperative/helpers.ml
+++ b/src/passes/3-self_ast_imperative/helpers.ml
@@ -19,8 +19,8 @@ let rec fold_expression : 'a folder -> 'a -> expression -> 'a result = fun f ini
   | E_look_up ab ->
       let%bind res = bind_fold_pair self init' ab in
       ok res
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
+  | E_application {lamb;args} -> (
+      let ab = (lamb,args) in
       let%bind res = bind_fold_pair self init' ab in
       ok res
     )
@@ -59,6 +59,11 @@ let rec fold_expression : 'a folder -> 'a -> expression -> 'a result = fun f ini
   | E_recursive { lambda={result=e;_}; _} ->
       let%bind res = self init' e in
       ok res
+  | E_sequence {expr1;expr2} ->
+      let ab = (expr1,expr2) in
+      let%bind res = bind_fold_pair self init' ab in
+      ok res
+     
 
 and fold_cases : 'a folder -> 'a -> matching_expr -> 'a result = fun f init m ->
   match m with
@@ -145,10 +150,10 @@ let rec map_expression : exp_mapper -> expression -> expression result = fun f e
       let%bind e' = self c.element in
       return @@ E_constructor {c with element = e'}
   )
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
-      let%bind (a,b) = bind_map_pair self ab in
-      return @@ E_application {expr1=a;expr2=b}
+  | E_application {lamb;args} -> (
+      let ab = (lamb,args) in
+      let%bind (lamb,args) = bind_map_pair self ab in
+      return @@ E_application {lamb;args}
     )
   | E_let_in { let_binder ; mut; rhs ; let_result; inline } -> (
       let%bind rhs = self rhs in
@@ -167,6 +172,10 @@ let rec map_expression : exp_mapper -> expression -> expression result = fun f e
       let%bind args = bind_map_list self c.arguments in
       return @@ E_constant {c with arguments=args}
     )
+  | E_sequence {expr1;expr2} -> (
+      let%bind (expr1,expr2) = bind_map_pair self (expr1,expr2) in
+      return @@ E_sequence {expr1;expr2}
+    )
   | E_literal _ | E_variable _ | E_skip as e' -> return e'
 
 and map_type_expression : ty_exp_mapper -> type_expression -> type_expression result = fun f te ->
@@ -288,10 +297,10 @@ let rec fold_map_expression : 'a fold_mapper -> 'a -> expression -> ('a * expres
       let%bind (res,e') = self init' c.element in
       ok (res, return @@ E_constructor {c with element = e'})
   )
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
+  | E_application {lamb;args} -> (
+      let ab = (lamb,args) in
       let%bind (res,(a,b)) = bind_fold_map_pair self init' ab in
-      ok (res, return @@ E_application {expr1=a;expr2=b})
+      ok (res, return @@ E_application {lamb=a;args=b})
     )
   | E_let_in { let_binder ; mut; rhs ; let_result; inline } -> (
       let%bind (res,rhs) = self init' rhs in
@@ -310,6 +319,10 @@ let rec fold_map_expression : 'a fold_mapper -> 'a -> expression -> ('a * expres
       let%bind (res,args) = bind_fold_map_list self init' c.arguments in
       ok (res, return @@ E_constant {c with arguments=args})
     )
+  | E_sequence {expr1;expr2} -> (
+      let%bind (res,(expr1,expr2)) = bind_fold_map_pair self init' (expr1,expr2) in
+      ok (res, return @@ E_sequence {expr1;expr2})
+    )
   | E_literal _ | E_variable _ | E_skip as e' -> ok (init', return e')
 
 and fold_map_cases : 'a fold_mapper -> 'a -> matching_expr -> ('a * matching_expr) result = fun f init m ->
diff --git a/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
index fc30c7e88..9cdfed78e 100644
--- a/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
+++ b/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
@@ -68,10 +68,10 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind arguments = bind_map_list compile_expression arguments in
       return @@ O.E_constant {cons_name;arguments}
     | I.E_variable name     -> return @@ O.E_variable name
-    | I.E_application {expr1;expr2} -> 
-      let%bind expr1 = compile_expression expr1 in
-      let%bind expr2 = compile_expression expr2 in
-      return @@ O.E_application {expr1; expr2}
+    | I.E_application {lamb;args} -> 
+      let%bind lamb = compile_expression lamb in
+      let%bind args = compile_expression args in
+      return @@ O.E_application {lamb;args}
     | I.E_lambda lambda ->
       let%bind lambda = compile_lambda lambda in
       return @@ O.E_lambda lambda
@@ -85,7 +85,6 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind rhs = compile_expression rhs in
       let%bind let_result = compile_expression let_result in
       return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
-    | I.E_skip -> return @@ O.E_skip
     | I.E_constructor {constructor;element} ->
       let%bind element = compile_expression element in
       return @@ O.E_constructor {constructor;element}
@@ -134,6 +133,11 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind anno_expr = compile_expression anno_expr in
       let%bind type_annotation = compile_type_expression type_annotation in
       return @@ O.E_ascription {anno_expr; type_annotation}
+    | I.E_sequence {expr1; expr2} ->
+      let%bind expr1 = compile_expression expr1 in
+      let%bind expr2 = compile_expression expr2 in
+      return @@ O.E_sequence {expr1; expr2}
+    | I.E_skip -> return @@ O.E_skip
 and compile_lambda : I.lambda -> O.lambda result =
   fun {binder;input_type;output_type;result}->
     let%bind input_type = bind_map_option compile_type_expression input_type in
@@ -252,10 +256,10 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind arguments = bind_map_list uncompile_expression arguments in
     return @@ I.E_constant {cons_name;arguments}
   | O.E_variable name     -> return @@ I.E_variable name
-  | O.E_application {expr1;expr2} -> 
-    let%bind expr1 = uncompile_expression expr1 in
-    let%bind expr2 = uncompile_expression expr2 in
-    return @@ I.E_application {expr1; expr2}
+  | O.E_application {lamb; args} -> 
+    let%bind lamb = uncompile_expression lamb in
+    let%bind args = uncompile_expression args in
+    return @@ I.E_application {lamb; args}
   | O.E_lambda lambda ->
     let%bind lambda = uncompile_lambda lambda in
     return @@ I.E_lambda lambda
@@ -269,7 +273,6 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind rhs = uncompile_expression rhs in
     let%bind let_result = uncompile_expression let_result in
     return @@ I.E_let_in {let_binder=(binder,ty_opt);mut=false;inline;rhs;let_result}
-  | O.E_skip -> return @@ I.E_skip
   | O.E_constructor {constructor;element} ->
     let%bind element = uncompile_expression element in
     return @@ I.E_constructor {constructor;element}
@@ -318,6 +321,11 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind anno_expr = uncompile_expression anno_expr in
     let%bind type_annotation = uncompile_type_expression type_annotation in
     return @@ I.E_ascription {anno_expr; type_annotation}
+  | O.E_sequence {expr1; expr2} ->
+    let%bind expr1 = uncompile_expression expr1 in
+    let%bind expr2 = uncompile_expression expr2 in
+    return @@ I.E_sequence {expr1; expr2}
+  | O.E_skip -> return @@ I.E_skip
 
 and uncompile_lambda : O.lambda -> I.lambda result =
   fun {binder;input_type;output_type;result}->
diff --git a/src/passes/6-sugar_to_core/sugar_to_core.ml b/src/passes/6-sugar_to_core/sugar_to_core.ml
index c55c2561c..261bb1e81 100644
--- a/src/passes/6-sugar_to_core/sugar_to_core.ml
+++ b/src/passes/6-sugar_to_core/sugar_to_core.ml
@@ -68,10 +68,10 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind arguments = bind_map_list compile_expression arguments in
       return @@ O.E_constant {cons_name;arguments}
     | I.E_variable name     -> return @@ O.E_variable name
-    | I.E_application {expr1;expr2} -> 
-      let%bind expr1 = compile_expression expr1 in
-      let%bind expr2 = compile_expression expr2 in
-      return @@ O.E_application {expr1; expr2}
+    | I.E_application {lamb;args} -> 
+      let%bind lamb = compile_expression lamb in
+      let%bind args = compile_expression args in
+      return @@ O.E_application {lamb; args}
     | I.E_lambda lambda ->
       let%bind lambda = compile_lambda lambda in
       return @@ O.E_lambda lambda
@@ -85,7 +85,6 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind rhs = compile_expression rhs in
       let%bind let_result = compile_expression let_result in
       return @@ O.E_let_in {let_binder=(binder,ty_opt);inline;rhs;let_result}
-    | I.E_skip -> ok @@ O.e_unit ~loc:e.location ()
     | I.E_constructor {constructor;element} ->
       let%bind element = compile_expression element in
       return @@ O.E_constructor {constructor;element}
@@ -134,6 +133,11 @@ let rec compile_expression : I.expression -> O.expression result =
       let%bind anno_expr = compile_expression anno_expr in
       let%bind type_annotation = idle_type_expression type_annotation in
       return @@ O.E_ascription {anno_expr; type_annotation}
+    | I.E_sequence {expr1; expr2} ->
+      let%bind expr1 = compile_expression expr1 in
+      let%bind expr2 = compile_expression expr2 in
+      return @@ O.E_let_in {let_binder=(Var.of_name "_", Some O.t_unit); rhs=expr1;let_result=expr2; inline=false}
+    | I.E_skip -> ok @@ O.e_unit ~loc:e.location ()
 
 and compile_lambda : I.lambda -> O.lambda result =
   fun {binder;input_type;output_type;result}->
@@ -253,10 +257,10 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind arguments = bind_map_list uncompile_expression arguments in
     return @@ I.E_constant {cons_name;arguments}
   | O.E_variable name     -> return @@ I.E_variable name
-  | O.E_application {expr1;expr2} -> 
-    let%bind expr1 = uncompile_expression expr1 in
-    let%bind expr2 = uncompile_expression expr2 in
-    return @@ I.E_application {expr1; expr2}
+  | O.E_application {lamb; args} -> 
+    let%bind lamb = uncompile_expression lamb in
+    let%bind args = uncompile_expression args in
+    return @@ I.E_application {lamb; args}
   | O.E_lambda lambda ->
     let%bind lambda = uncompile_lambda lambda in
     return @@ I.E_lambda lambda
@@ -264,6 +268,10 @@ let rec uncompile_expression : O.expression -> I.expression result =
     let%bind fun_type = uncompile_type_expression fun_type in
     let%bind lambda = uncompile_lambda lambda in
     return @@ I.E_recursive {fun_name;fun_type;lambda}
+  | O.E_let_in {let_binder;inline=false;rhs=expr1;let_result=expr2} when let_binder = (Var.of_name "_", Some O.t_unit) ->
+    let%bind expr1 = uncompile_expression expr1 in
+    let%bind expr2 = uncompile_expression expr2 in
+    return @@ I.E_sequence {expr1;expr2}
   | O.E_let_in {let_binder;inline;rhs;let_result} ->
     let (binder,ty_opt) = let_binder in
     let%bind ty_opt = bind_map_option uncompile_type_expression ty_opt in
diff --git a/src/passes/8-typer-new/typer.ml b/src/passes/8-typer-new/typer.ml
index 215df7ebd..0dcae68d0 100644
--- a/src/passes/8-typer-new/typer.ml
+++ b/src/passes/8-typer-new/typer.ml
@@ -679,11 +679,11 @@ and type_expression : environment -> Solver.state -> ?tv_opt:O.type_expression -
    *   let%bind (name', tv) =
    *     type_constant name tv_lst tv_opt ae.location in
    *   return (E_constant (name' , lst')) tv *)
-  | E_application {expr1;expr2} ->
-    let%bind (f' , state') = type_expression e state expr1 in
-    let%bind (arg , state'') = type_expression e state' expr2 in
-    let wrapped = Wrap.application f'.type_expression arg.type_expression in
-    return_wrapped (E_application {expr1=f';expr2=arg}) state'' wrapped
+  | E_application {lamb;args} ->
+    let%bind (f' , state') = type_expression e state lamb in
+    let%bind (args , state'') = type_expression e state' args in
+    let wrapped = Wrap.application f'.type_expression args.type_expression in
+    return_wrapped (E_application {lamb=f';args}) state'' wrapped
 
   (* | E_look_up dsi ->
    *   let%bind (ds, ind) = bind_map_pair (type_expression e) dsi in
@@ -1037,9 +1037,9 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       return (e_constant cons_name lst')
   | E_variable (n) ->
     return (e_variable (n))
-  | E_application {expr1;expr2} ->
-      let%bind f' = untype_expression expr1 in
-      let%bind arg' = untype_expression expr2 in
+  | E_application {lamb;args} ->
+      let%bind f' = untype_expression lamb in
+      let%bind arg' = untype_expression args in
       return (e_application f' arg')
   | E_lambda lambda ->
       let%bind lambda = untype_lambda e.type_expression lambda in
diff --git a/src/passes/8-typer-old/typer.ml b/src/passes/8-typer-old/typer.ml
index bc6924df0..5a11d6184 100644
--- a/src/passes/8-typer-old/typer.ml
+++ b/src/passes/8-typer-old/typer.ml
@@ -688,21 +688,21 @@ and type_expression' : environment -> ?tv_opt:O.type_expression -> I.expression
       let%bind (name', tv) =
         type_constant cons_name tv_lst tv_opt in
       return (E_constant {cons_name=name';arguments=lst'}) tv
-  | E_application {expr1;expr2} ->
-      let%bind expr1' = type_expression' e expr1 in
-      let%bind expr2 = type_expression' e expr2 in
-      let%bind tv = match expr1'.type_expression.type_content with
+  | E_application {lamb; args} ->
+      let%bind lamb' = type_expression' e lamb in
+      let%bind args' = type_expression' e args in
+      let%bind tv = match lamb'.type_expression.type_content with
         | T_arrow {type1;type2} ->
-            let%bind _ = O.assert_type_expression_eq (type1, expr2.type_expression) in
+            let%bind _ = O.assert_type_expression_eq (type1, args'.type_expression) in
             ok type2
         | _ ->
           fail @@ type_error_approximate
             ~expected:"should be a function type"
-            ~expression:expr1
-            ~actual:expr1'.type_expression
-            expr1'.location
+            ~expression:lamb
+            ~actual:lamb'.type_expression
+            lamb'.location
       in
-      return (E_application {expr1=expr1';expr2}) tv
+      return (E_application {lamb=lamb'; args=args'}) tv
   | E_look_up dsi ->
       let%bind (ds, ind) = bind_map_pair (type_expression' e) dsi in
       let%bind (src, dst) = bind_map_or (get_t_map , get_t_big_map) ds.type_expression in
@@ -841,9 +841,9 @@ let rec untype_expression (e:O.expression) : (I.expression) result =
       return (e_constant cons_name lst')
   | E_variable n ->
       return (e_variable (n))
-  | E_application {expr1;expr2} ->
-      let%bind f' = untype_expression expr1 in
-      let%bind arg' = untype_expression expr2 in
+  | E_application {lamb;args} ->
+      let%bind f' = untype_expression lamb in
+      let%bind arg' = untype_expression args in
       return (e_application f' arg')
   | E_lambda {binder ; result} -> (
       let%bind io = get_t_function ty in
diff --git a/src/passes/9-self_ast_typed/helpers.ml b/src/passes/9-self_ast_typed/helpers.ml
index 818cdccf5..2da8a766e 100644
--- a/src/passes/9-self_ast_typed/helpers.ml
+++ b/src/passes/9-self_ast_typed/helpers.ml
@@ -19,8 +19,8 @@ let rec fold_expression : 'a folder -> 'a -> expression -> 'a result = fun f ini
   | E_look_up ab ->
       let%bind res = bind_fold_pair self init' ab in
       ok res
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
+  | E_application {lamb; args} -> (
+      let ab = (lamb, args) in
       let%bind res = bind_fold_pair self init' ab in
       ok res
     )
@@ -135,10 +135,10 @@ let rec map_expression : mapper -> expression -> expression result = fun f e ->
       let%bind e' = self c.element in
       return @@ E_constructor {c with element = e'}
   )
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
+  | E_application {lamb; args} -> (
+      let ab = (lamb, args) in
       let%bind (a,b) = bind_map_pair self ab in
-      return @@ E_application {expr1=a;expr2=b}
+      return @@ E_application {lamb=a;args=b}
     )
   | E_let_in { let_binder ; rhs ; let_result; inline } -> (
       let%bind rhs = self rhs in
@@ -251,10 +251,10 @@ let rec fold_map_expression : 'a fold_mapper -> 'a -> expression -> ('a * expres
       let%bind (res,e') = self init' c.element in
       ok (res, return @@ E_constructor {c with element = e'})
   )
-  | E_application {expr1;expr2} -> (
-      let ab = (expr1,expr2) in
+  | E_application {lamb;args} -> (
+      let ab = (lamb, args) in
       let%bind (res,(a,b)) = bind_fold_map_pair self init' ab in
-      ok (res, return @@ E_application {expr1=a;expr2=b})
+      ok (res, return @@ E_application {lamb=a;args=b})
     )
   | E_let_in { let_binder ; rhs ; let_result; inline } -> (
       let%bind (res,rhs) = self init' rhs in
diff --git a/src/passes/9-self_ast_typed/tail_recursion.ml b/src/passes/9-self_ast_typed/tail_recursion.ml
index 3e971c79e..610484a38 100644
--- a/src/passes/9-self_ast_typed/tail_recursion.ml
+++ b/src/passes/9-self_ast_typed/tail_recursion.ml
@@ -24,9 +24,9 @@ let rec check_recursive_call : expression_variable -> bool -> expression -> unit
     Assert.assert_true (final_path || n <> v) in
     ok ()
     )
-  | E_application {expr1;expr2} ->
-    let%bind _ = check_recursive_call n final_path expr1 in
-    let%bind _ = check_recursive_call n false expr2 in
+  | E_application {lamb;args} ->
+    let%bind _ = check_recursive_call n final_path lamb in
+    let%bind _ = check_recursive_call n false args in
     ok ()
   | E_lambda {result;_} ->
     let%bind _ = check_recursive_call n final_path result in
diff --git a/src/stages/1-ast_imperative/PP.ml b/src/stages/1-ast_imperative/PP.ml
index 576575d69..ebb4bd83e 100644
--- a/src/stages/1-ast_imperative/PP.ml
+++ b/src/stages/1-ast_imperative/PP.ml
@@ -18,8 +18,8 @@ and expression_content ppf (ec : expression_content) =
       literal ppf l
   | E_variable n ->
       fprintf ppf "%a" expression_variable n
-  | E_application app ->
-      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_application {lamb;args} ->
+      fprintf ppf "(%a)@(%a)" expression lamb expression args
   | E_constructor c ->
       fprintf ppf "%a(%a)" constructor c.constructor expression c.element
   | E_constant c ->
@@ -59,11 +59,13 @@ and expression_content ppf (ec : expression_content) =
         expression_content (E_lambda lambda)
   | E_let_in { let_binder ; mut; rhs ; let_result; inline } ->    
       fprintf ppf "let %a%a = %a%a in %a" option_mut mut option_type_name let_binder expression rhs option_inline inline expression let_result
-  | E_skip ->
-      fprintf ppf "skip"
   | E_ascription {anno_expr; type_annotation} ->
       fprintf ppf "%a : %a" expression anno_expr type_expression
         type_annotation
+  | E_sequence {expr1;expr2} ->
+      fprintf ppf "%a;\n%a" expression expr1 expression expr2
+  | E_skip ->
+      fprintf ppf "skip"
 
 and option_type_name ppf
     ((n, ty_opt) : expression_variable * type_expression option) =
diff --git a/src/stages/1-ast_imperative/combinators.ml b/src/stages/1-ast_imperative/combinators.ml
index ceacdcc4e..92a1dbe73 100644
--- a/src/stages/1-ast_imperative/combinators.ml
+++ b/src/stages/1-ast_imperative/combinators.ml
@@ -125,11 +125,11 @@ let e_skip ?loc () = make_expr ?loc @@ E_skip
 let e_let_in ?loc (binder, ascr) mut inline rhs let_result = 
   make_expr ?loc @@ E_let_in { let_binder = (binder, ascr) ; mut; rhs ; let_result; inline }
 let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
-let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_application ?loc a b = make_expr ?loc @@ E_application {lamb=a ; args=b}
 let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
 let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
 let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
-let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false false expr1 expr2
+let e_sequence ?loc expr1 expr2 = make_expr ?loc @@ E_sequence {expr1; expr2}
 let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
 (*
 let e_assign ?loc a b c = location_wrap ?loc @@ E_assign (Var.of_name a , b , c) (* TODO handlethat*)
diff --git a/src/stages/1-ast_imperative/misc.ml b/src/stages/1-ast_imperative/misc.ml
index f2094d3ca..324529525 100644
--- a/src/stages/1-ast_imperative/misc.ml
+++ b/src/stages/1-ast_imperative/misc.ml
@@ -184,7 +184,7 @@ let rec assert_value_eq (a, b: (expression * expression )) : unit result =
   | (E_application _, _) | (E_let_in _, _)
   | (E_recursive _,_) | (E_record_accessor _, _)
   | (E_look_up _, _) | (E_matching _, _)
-  | (E_skip, _) -> simple_fail "comparing not a value"
+  | (E_sequence _, _) | (E_skip, _) -> simple_fail "comparing not a value"
 
 let is_value_eq (a , b) = to_bool @@ assert_value_eq (a , b)
 
diff --git a/src/stages/1-ast_imperative/types.ml b/src/stages/1-ast_imperative/types.ml
index 6d64cafd1..4d0d0bd68 100644
--- a/src/stages/1-ast_imperative/types.ml
+++ b/src/stages/1-ast_imperative/types.ml
@@ -36,7 +36,6 @@ and expression_content =
   | E_lambda of lambda
   | E_recursive of recursive
   | E_let_in of let_in
-  | E_skip
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
   | E_matching of matching
@@ -44,21 +43,26 @@ and expression_content =
   | E_record of expression label_map
   | E_record_accessor of accessor
   | E_record_update of update
+  (* Advanced *)
+  | E_ascription of ascription
+  (* Sugar *)
+  | E_sequence of sequence
+  | E_skip
   (* Data Structures *)
-  (* TODO : move to constant*)
-  | E_map of (expression * expression) list (*move to operator *)
-  | E_big_map of (expression * expression) list (*move to operator *)
+  | E_map of (expression * expression) list 
+  | E_big_map of (expression * expression) list
   | E_list of expression list
   | E_set of expression list
   | E_look_up of (expression * expression)
-  (* Advanced *)
-  | E_ascription of ascription
 
 and constant =
   { cons_name: constant' (* this is at the end because it is huge *)
   ; arguments: expression list }
 
-and application = {expr1: expression; expr2: expression}
+and application = {
+  lamb: expression ; 
+  args: expression ;
+  }
 
 and lambda =
   { binder: expression_variable
@@ -92,6 +96,10 @@ and matching =
   }
 
 and ascription = {anno_expr: expression; type_annotation: type_expression}
+and sequence = {
+  expr1: expression ;
+  expr2: expression ;
+  }
 
 and environment_element_definition =
   | ED_binder
diff --git a/src/stages/2-ast_sugar/PP.ml b/src/stages/2-ast_sugar/PP.ml
index c1288c6f3..d4a4ead08 100644
--- a/src/stages/2-ast_sugar/PP.ml
+++ b/src/stages/2-ast_sugar/PP.ml
@@ -18,8 +18,8 @@ and expression_content ppf (ec : expression_content) =
       literal ppf l
   | E_variable n ->
       fprintf ppf "%a" expression_variable n
-  | E_application app ->
-      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_application {lamb;args} ->
+      fprintf ppf "(%a)@(%a)" expression lamb expression args
   | E_constructor c ->
       fprintf ppf "%a(%a)" constructor c.constructor expression c.element
   | E_constant c ->
@@ -58,11 +58,12 @@ and expression_content ppf (ec : expression_content) =
         cases
   | E_let_in { let_binder ; rhs ; let_result; inline } ->    
     fprintf ppf "let %a = %a%a in %a" option_type_name let_binder expression rhs option_inline inline expression let_result
+  | E_sequence {expr1;expr2} ->
+      fprintf ppf "%a;\n%a" expression expr1 expression expr2
+  | E_ascription {anno_expr; type_annotation} ->
+      fprintf ppf "%a : %a" expression anno_expr type_expression type_annotation
   | E_skip ->
       fprintf ppf "skip"
-  | E_ascription {anno_expr; type_annotation} ->
-      fprintf ppf "%a : %a" expression anno_expr type_expression
-        type_annotation
 
 and option_type_name ppf
     ((n, ty_opt) : expression_variable * type_expression option) =
diff --git a/src/stages/2-ast_sugar/combinators.ml b/src/stages/2-ast_sugar/combinators.ml
index 04a336e93..759d6fc55 100644
--- a/src/stages/2-ast_sugar/combinators.ml
+++ b/src/stages/2-ast_sugar/combinators.ml
@@ -125,11 +125,11 @@ let e_skip ?loc () = make_expr ?loc @@ E_skip
 let e_let_in ?loc (binder, ascr) inline rhs let_result = 
   make_expr ?loc @@ E_let_in { let_binder = (binder, ascr) ; rhs ; let_result; inline }
 let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
-let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_application ?loc a b = make_expr ?loc @@ E_application {lamb=a ; args=b}
 let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
 let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
 let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
-let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false expr1 expr2
+let e_sequence ?loc expr1 expr2 = make_expr ?loc @@ E_sequence {expr1; expr2}
 let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
 (*
 let e_assign ?loc a b c = location_wrap ?loc @@ E_assign (Var.of_name a , b , c) (* TODO handlethat*)
diff --git a/src/stages/2-ast_sugar/misc.ml b/src/stages/2-ast_sugar/misc.ml
index f2094d3ca..324529525 100644
--- a/src/stages/2-ast_sugar/misc.ml
+++ b/src/stages/2-ast_sugar/misc.ml
@@ -184,7 +184,7 @@ let rec assert_value_eq (a, b: (expression * expression )) : unit result =
   | (E_application _, _) | (E_let_in _, _)
   | (E_recursive _,_) | (E_record_accessor _, _)
   | (E_look_up _, _) | (E_matching _, _)
-  | (E_skip, _) -> simple_fail "comparing not a value"
+  | (E_sequence _, _) | (E_skip, _) -> simple_fail "comparing not a value"
 
 let is_value_eq (a , b) = to_bool @@ assert_value_eq (a , b)
 
diff --git a/src/stages/2-ast_sugar/types.ml b/src/stages/2-ast_sugar/types.ml
index dffb887bb..81091dea7 100644
--- a/src/stages/2-ast_sugar/types.ml
+++ b/src/stages/2-ast_sugar/types.ml
@@ -36,7 +36,6 @@ and expression_content =
   | E_lambda of lambda
   | E_recursive of recursive
   | E_let_in of let_in
-  | E_skip
   (* Variant *)
   | E_constructor of constructor (* For user defined constructors *)
   | E_matching of matching
@@ -44,21 +43,26 @@ and expression_content =
   | E_record of expression label_map
   | E_record_accessor of accessor
   | E_record_update of update
+  (* Advanced *)
+  | E_ascription of ascription
+  (* Sugar *)
+  | E_sequence of sequence
+  | E_skip
   (* Data Structures *)
-  (* TODO : move to constant*)
-  | E_map of (expression * expression) list (*move to operator *)
-  | E_big_map of (expression * expression) list (*move to operator *)
+  | E_map of (expression * expression) list 
+  | E_big_map of (expression * expression) list
   | E_list of expression list
   | E_set of expression list
   | E_look_up of (expression * expression)
-  (* Advanced *)
-  | E_ascription of ascription
 
 and constant =
   { cons_name: constant' (* this is at the end because it is huge *)
   ; arguments: expression list }
 
-and application = {expr1: expression; expr2: expression}
+and application = {
+  lamb: expression ; 
+  args: expression ;
+  }
 
 and lambda =
   { binder: expression_variable
@@ -91,6 +95,10 @@ and matching =
   }
 
 and ascription = {anno_expr: expression; type_annotation: type_expression}
+and sequence = {
+  expr1: expression ;
+  expr2: expression ;
+  }
 
 and environment_element_definition =
   | ED_binder
diff --git a/src/stages/3-ast_core/PP.ml b/src/stages/3-ast_core/PP.ml
index 88d4875c5..3410a96fb 100644
--- a/src/stages/3-ast_core/PP.ml
+++ b/src/stages/3-ast_core/PP.ml
@@ -18,8 +18,8 @@ and expression_content ppf (ec : expression_content) =
       literal ppf l
   | E_variable n ->
       fprintf ppf "%a" expression_variable n
-  | E_application app ->
-      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_application {lamb;args} ->
+      fprintf ppf "(%a)@(%a)" expression lamb expression args
   | E_constructor c ->
       fprintf ppf "%a(%a)" constructor c.constructor expression c.element
   | E_constant c ->
diff --git a/src/stages/3-ast_core/combinators.ml b/src/stages/3-ast_core/combinators.ml
index ac1ee3798..db2417902 100644
--- a/src/stages/3-ast_core/combinators.ml
+++ b/src/stages/3-ast_core/combinators.ml
@@ -124,11 +124,10 @@ let e_variable ?loc v = make_expr ?loc @@ E_variable v
 let e_let_in ?loc (binder, ascr) inline rhs let_result = 
   make_expr ?loc @@ E_let_in { let_binder = (binder,ascr) ; rhs ; let_result; inline }
 let e_annotation ?loc anno_expr ty = make_expr ?loc @@ E_ascription {anno_expr; type_annotation = ty}
-let e_application ?loc a b = make_expr ?loc @@ E_application {expr1=a ; expr2=b}
+let e_application ?loc a b = make_expr ?loc @@ E_application {lamb=a ; args=b}
 let e_binop ?loc name a b  = make_expr ?loc @@ E_constant {cons_name = name ; arguments = [a ; b]}
 let e_constant ?loc name lst = make_expr ?loc @@ E_constant {cons_name=name ; arguments = lst}
 let e_look_up ?loc x y = make_expr ?loc @@ E_look_up (x , y)
-let e_sequence ?loc expr1 expr2 = e_let_in ?loc (Var.fresh (), Some t_unit) false expr1 expr2
 let e_cond ?loc expr match_true match_false = e_matching expr ?loc (Match_bool {match_true; match_false})
 (*
 let e_assign ?loc a b c = location_wrap ?loc @@ E_assign (Var.of_name a , b , c) (* TODO handlethat*)
diff --git a/src/stages/3-ast_core/combinators.mli b/src/stages/3-ast_core/combinators.mli
index b962ce3c6..ae0aab1bd 100644
--- a/src/stages/3-ast_core/combinators.mli
+++ b/src/stages/3-ast_core/combinators.mli
@@ -83,7 +83,6 @@ val e_matching_bool : ?loc:Location.t -> expression -> expression -> expression
 val e_accessor : ?loc:Location.t -> expression -> string -> expression
 val e_accessor_list : ?loc:Location.t -> expression -> string list -> expression
 val e_variable : ?loc:Location.t -> expression_variable -> expression
-val e_sequence : ?loc:Location.t -> expression -> expression -> expression
 val e_cond: ?loc:Location.t -> expression -> expression -> expression -> expression
 val e_let_in : ?loc:Location.t -> ( expression_variable * type_expression option ) -> bool -> expression -> expression -> expression
 val e_annotation : ?loc:Location.t -> expression -> type_expression -> expression
diff --git a/src/stages/3-ast_core/types.ml b/src/stages/3-ast_core/types.ml
index 781214f51..2b8f0dbc2 100644
--- a/src/stages/3-ast_core/types.ml
+++ b/src/stages/3-ast_core/types.ml
@@ -57,7 +57,10 @@ and constant =
   { cons_name: constant' (* this is at the end because it is huge *)
   ; arguments: expression list }
 
-and application = {expr1: expression; expr2: expression}
+and application = {
+  lamb: expression ; 
+  args: expression ;
+  }
 
 and lambda =
   { binder: expression_variable
diff --git a/src/stages/4-ast_typed/PP.ml b/src/stages/4-ast_typed/PP.ml
index aed4648c5..1325d0476 100644
--- a/src/stages/4-ast_typed/PP.ml
+++ b/src/stages/4-ast_typed/PP.ml
@@ -19,8 +19,8 @@ and expression_content ppf (ec: expression_content) =
       literal ppf l
   | E_variable n ->
       fprintf ppf "%a" expression_variable n
-  | E_application app ->
-      fprintf ppf "(%a)@(%a)" expression app.expr1 expression app.expr2
+  | E_application {lamb;args} ->
+      fprintf ppf "(%a)@(%a)" expression lamb expression args
   | E_constructor c ->
       fprintf ppf "%a(%a)" constructor c.constructor expression c.element
   | E_constant c ->
diff --git a/src/stages/4-ast_typed/combinators.ml b/src/stages/4-ast_typed/combinators.ml
index e9071df97..014ab8f2f 100644
--- a/src/stages/4-ast_typed/combinators.ml
+++ b/src/stages/4-ast_typed/combinators.ml
@@ -294,7 +294,7 @@ let e_chain_id s : expression_content = E_literal (Literal_chain_id s)
 let e_operation s : expression_content = E_literal (Literal_operation s)
 let e_lambda l : expression_content = E_lambda l
 let e_pair a b : expression_content = ez_e_record [(Label "0",a);(Label "1", b)]
-let e_application expr1 expr2 : expression_content = E_application {expr1;expr2}
+let e_application lamb args : expression_content = E_application {lamb;args}
 let e_variable v : expression_content = E_variable v
 let e_list lst : expression_content = E_list lst
 let e_let_in let_binder inline rhs let_result = E_let_in { let_binder ; rhs ; let_result; inline }
diff --git a/src/stages/4-ast_typed/misc.ml b/src/stages/4-ast_typed/misc.ml
index 20a778f9c..04efcca5f 100644
--- a/src/stages/4-ast_typed/misc.ml
+++ b/src/stages/4-ast_typed/misc.ml
@@ -206,7 +206,7 @@ module Free_variables = struct
         | true -> empty
         | false -> singleton name
       )
-    | E_application {expr1;expr2} -> unions @@ List.map self [ expr1 ; expr2 ]
+    | E_application {lamb;args} -> unions @@ List.map self [ lamb ; args ]
     | E_constructor {element;_} -> self element
     | E_record m -> unions @@ List.map self @@ LMap.to_list m
     | E_record_accessor {expr;_} -> self expr
diff --git a/src/stages/4-ast_typed/misc_smart.ml b/src/stages/4-ast_typed/misc_smart.ml
index 414f01670..0040f7d90 100644
--- a/src/stages/4-ast_typed/misc_smart.ml
+++ b/src/stages/4-ast_typed/misc_smart.ml
@@ -63,8 +63,8 @@ module Captured_variables = struct
         | ED_binder -> ok empty
         | ED_declaration {expr=_ ; free_variables=_} -> simple_fail "todo"
       )
-    | E_application {expr1;expr2} ->
-      let%bind lst' = bind_map_list self [ expr1 ; expr2 ] in
+    | E_application {lamb;args} ->
+      let%bind lst' = bind_map_list self [ lamb ; args ] in
       ok @@ unions lst'
     | E_constructor {element;_} -> self element
     | E_record m ->
diff --git a/src/stages/4-ast_typed/types.ml b/src/stages/4-ast_typed/types.ml
index a0d7c067a..fdb24969b 100644
--- a/src/stages/4-ast_typed/types.ml
+++ b/src/stages/4-ast_typed/types.ml
@@ -61,7 +61,10 @@ and constant =
   { cons_name: constant'
   ; arguments: expression list }
 
-and application = {expr1: expression; expr2: expression}
+and application = {
+  lamb: expression ; 
+  args: expression ;
+  }
 
 and lambda =  {
     binder: expression_variable ;
diff --git a/src/stages/typesystem/misc.ml b/src/stages/typesystem/misc.ml
index dcb46929b..4b60cf454 100644
--- a/src/stages/typesystem/misc.ml
+++ b/src/stages/typesystem/misc.ml
@@ -151,10 +151,10 @@ module Substitution = struct
       | T.E_variable        tv ->
         let%bind tv = s_variable ~substs tv in
         ok @@ T.E_variable tv
-      | T.E_application {expr1;expr2} ->
-        let%bind expr1 = s_expression ~substs expr1 in
-        let%bind expr2 = s_expression ~substs expr2 in
-        ok @@ T.E_application {expr1;expr2}
+      | T.E_application {lamb;args} ->
+        let%bind lamb = s_expression ~substs lamb in
+        let%bind args = s_expression ~substs args in
+        ok @@ T.E_application {lamb;args}
       | T.E_lambda          { binder; result } ->
         let%bind binder = s_variable ~substs binder in
         let%bind result = s_expression ~substs result in

From c491b826ffcba90a43a4ea8089fa01cf71a18f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= <ligo@suzanne.soy>
Date: Mon, 23 Mar 2020 16:34:21 +0100
Subject: [PATCH 42/43] Blank commit to trigger the CI due to some GitLab
 failure.


From f266b3f0ee8c41047c0fd5d1f0c7eddd841a8a74 Mon Sep 17 00:00:00 2001
From: Eowyn Dean <eowyn.bridget@gmail.com>
Date: Mon, 23 Mar 2020 19:52:02 +0000
Subject: [PATCH 43/43] Added FAQ

---
 gitlab-pages/docs/intro/FAQ.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 gitlab-pages/docs/intro/FAQ.md

diff --git a/gitlab-pages/docs/intro/FAQ.md b/gitlab-pages/docs/intro/FAQ.md
new file mode 100644
index 000000000..33501af46
--- /dev/null
+++ b/gitlab-pages/docs/intro/FAQ.md
@@ -0,0 +1,11 @@
+---
+id: faq
+title: FAQ
+---
+
+# Frequently Asked Questions
+
+Before you ask...
+
+## Question One
+Answer.