Fix AssocExpression walking, and ConditionalExpression and SwitchStatement parsing

* Recognize ObjectExpressoinas AssocExpressoin for comatibility.
* Do not crash on unfinished switch statement.
* Fix walking of consequent and alternate of ConditionalExpression.
* Upgrade dependencies.

Author: prantlf

.gitignore

@@ -5,5 +5,6 @@
 coverage
 dist/bin
 dist/*.[jm]*
+pkg/walker/dist/*.[jm]*
 node_modules
 npm-debug.log

dist/index.d.ts

@@ -361,9 +361,9 @@ export type Expression = BinaryExpression | ConditionalExpression
 
 export interface ConditionalExpression extends Node {
   type: 'ConditionalExpression'
-  test: Expression
-  consequent: Statement[]
-  alternate: Statement[]
+  test: BinaryExpression
+  consequent: Expression
+  alternate: Expression
 }
 
 export interface BinaryExpression extends Node {
@@ -439,7 +439,7 @@ export interface CallExpression extends Node {
 
 export type PrimaryExpression = XlateExpression | ParenthesisExpression |
 ThisExpression | SuperExpression | AssocExpression | ListExpression |
-ListComprehension | ObjectName | Identifier | Literal
+ListComprehension | ObjectName | Identifier | Literal | ObjectExpression
 
 export interface ThisExpression extends Node {
   type: 'ThisExpression'
@@ -454,6 +454,8 @@ export interface AssocExpression extends Node {
   properties: Property[]
 }
 
+export type ObjectExpression = AssocExpression
+
 export interface Property extends Node {
   type: 'Property'
   key: Expression

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oscript-parser",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "A parser for the OScript language written in JavaScript.",
   "author": "Ferdinand Prantl <[email protected]> (http://prantlf.tk/)",
   "keywords": [
@@ -72,9 +72,9 @@
   "devDependencies": {
     "@prantlf/railroad-diagrams": "1.0.1",
     "@rollup/plugin-json": "4.1.0",
-    "@types/node": "14.14.19",
-    "@typescript-eslint/eslint-plugin": "4.11.1",
-    "@typescript-eslint/parser": "4.11.1",
+    "@types/node": "14.14.20",
+    "@typescript-eslint/eslint-plugin": "4.12.0",
+    "@typescript-eslint/parser": "4.12.0",
     "benchmark": "2.1.4",
     "chevrotain": "7.1.0",
     "eslint": "7.17.0",
@@ -89,7 +89,7 @@
     "minimatch": "3.0.4",
     "mkdirp": "1.0.4",
     "nyc": "15.1.0",
-    "rollup": "2.35.1",
+    "rollup": "2.36.1",
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-terser": "7.0.2",
     "rrdiagram-js": "1.0.7",

pkg/parser/index.js

@@ -1440,6 +1440,7 @@ function parseSwitchStatement () {
         continue
       }
     }
+    if (!caseOrDefault) handleUnexpectedToken(token, 'case, default or end')
     statements.push(parseStatement())
   }
 

pkg/walker/index.js

@@ -358,8 +358,8 @@ base.VariableDeclarator = (node, state, walk) => {
 
 base.ConditionalExpression = (node, state, walk) => {
   walk(node.test, node, state)
-  for (const statement of node.consequent) walk(statement, node, state)
-  for (const statement of node.alternate) walk(statement, node, state)
+  walk(node.consequent, node, state)
+  walk(node.alternate, node, state)
 }
 
 base.BinaryExpression = (node, state, walk) => {
@@ -394,7 +394,7 @@ base.CallExpression = (node, state, walk) => {
 
 base.ThisExpression = base.SuperExpression = ignore
 
-base.AssocExpression = (node, state, walk) => {
+base.AssocExpression = base.ObjectExpression = (node, state, walk) => {
   for (const property of node.properties) walk(property, node, state)
 }
 

pkg/walker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oscript-ast-walker",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "A walker for nodes of the abstract syntax tree (AST) for the OScript language.",
   "author": "Ferdinand Prantl <[email protected]> (http://prantlf.tk/)",
   "keywords": [