starlight-cli 1.1.11 → 1.1.13

package/src/parser.js

@@ -1,18 +1,36 @@
+const COLOR = {
+  reset: '\x1b[0m',
+  red: '\x1b[31m',
+  yellow: '\x1b[33m',
+  white: '\x1b[37m'
+};
+
 class ParseError extends Error {
-  constructor(message, token, source) {
+  constructor(message, token, source, suggestion = null) {
     const line = token?.line ?? '?';
     const column = token?.column ?? '?';
 
-    let output = `${message}\n`;
+    let output = `${COLOR.red}${message}${COLOR.reset}\n`;
+
+    if (suggestion) {
+      output += `${COLOR.yellow}${suggestion}${COLOR.reset}\n`;
+    }
 
     if (source && token?.line != null) {
       const lines = source.split('\n');
       const srcLine = lines[token.line - 1] || '';
-      output += `  at line ${line}, column ${column}\n`;
-      output += `    ${srcLine}\n`;
-      output += `    ${' '.repeat(column - 1)}^\n`;
+
+      output += `${COLOR.white}  at line ${line}, column ${column}\n`;
+      const caretPos =
+  typeof column === 'number' && column > 0
+    ? column - 1
+    : 0;
+
+output += `    ${srcLine}\n`;
+output += `    ${' '.repeat(caretPos)}^\n${COLOR.reset}`;
+
     } else {
-      output += `  at line ${line}, column ${column}\n`;
+      output += `${COLOR.white}  at line ${line}, column ${column}\n${COLOR.reset}`;
     }
 
     super(output);
@@ -87,17 +105,49 @@ class Parser {
 varDeclaration() {
   const t = this.current; 
   this.eat('LET');
+
+  if (this.current.type !== 'IDENTIFIER') {
+    throw new ParseError(
+      "Expected variable name after 'let'",
+      this.current,
+      this.source,
+      "Variable declarations must be followed by an identifier, e.g. let x = 5"
+    );
+  }
+
   const idToken = this.current; 
   const id = idToken.value;
   this.eat('IDENTIFIER');
 
   let expr = null;
+
+  if (this.current.type === 'EQEQ') {
+    throw new ParseError(
+      "Invalid '==' in variable declaration",
+      this.current,
+      this.source,
+      "Did you mean '=' for assignment?"
+    );
+  }
+
   if (this.current.type === 'EQUAL') {
     this.eat('EQUAL');
+
+    if (this.current.type === 'SEMICOLON') {
+      throw new ParseError(
+        "Expected expression after '='",
+        this.current,
+        this.source,
+        "Assignments require a value, e.g. let x = 10"
+      );
+    }
+
     expr = this.expression();
   }
 
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  if (this.current.type === 'SEMICOLON') {
+    this.eat('SEMICOLON');
+  }
 
   return { 
     type: 'VarDeclaration', 
@@ -107,12 +157,31 @@ varDeclaration() {
     column: t.column 
   };
 }
+
 startStatement() {
   const t = this.current; 
   this.eat('START');
 
+  if (this.current.type === 'LBRACE') {
+    throw new ParseError(
+      "Expected expression after 'start'",
+      this.current,
+      this.source,
+      "The 'start' statement requires a discriminant expression"
+    );
+  }
+
   const discriminant = this.expression();
 
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' to start start-block",
+      this.current,
+      this.source,
+      "Start blocks must be enclosed in braces"
+    );
+  }
+
   this.eat('LBRACE');
 
   const cases = [];
@@ -121,6 +190,24 @@ startStatement() {
     cases.push(this.raceClause());
   }
 
+  if (cases.length === 0) {
+    throw new ParseError(
+      "Start statement must contain at least one 'race' clause",
+      this.current,
+      this.source,
+      "Use 'race <condition> { ... }' inside start blocks"
+    );
+  }
+
+  if (this.current.type !== 'RBRACE') {
+    throw new ParseError(
+      "Expected '}' to close start block",
+      this.current,
+      this.source,
+      "Did you forget to close the start block?"
+    );
+  }
+
   this.eat('RBRACE');
 
   return {
@@ -135,8 +222,26 @@ raceClause() {
   const t = this.current; 
   this.eat('RACE');
 
+  if (this.current.type === 'LBRACE') {
+    throw new ParseError(
+      "Expected condition after 'race'",
+      this.current,
+      this.source,
+      "Race clauses require a condition before the block"
+    );
+  }
+
   const test = this.expression();
 
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' after race condition",
+      this.current,
+      this.source,
+      "Race clauses must use a block: race condition { ... }"
+    );
+  }
+
   const consequent = this.block();
 
   return {
@@ -148,11 +253,26 @@ raceClause() {
   };
 }
 
+
 sldeployStatement() {
   const t = this.current; 
   this.eat('SLDEPLOY');
+
+  if (this.current.type === 'SEMICOLON') {
+    throw new ParseError(
+      "Expected expression after 'sldeploy'",
+      this.current,
+      this.source,
+      "sldeploy requires a value or expression to deploy"
+    );
+  }
+
   const expr = this.expression();
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+
+  if (this.current.type === 'SEMICOLON') {
+    this.eat('SEMICOLON');
+  }
+
   return { 
     type: 'SldeployStatement', 
     expr, 
@@ -165,11 +285,31 @@ doTrackStatement() {
   const t = this.current;
   this.eat('DO');
 
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' after 'do'",
+      this.current,
+      this.source,
+      "The 'do' statement must be followed by a block"
+    );
+  }
+
   const body = this.block();
 
   let handler = null;
+
   if (this.current.type === 'TRACK') {
     this.eat('TRACK');
+
+    if (this.current.type !== 'LBRACE') {
+      throw new ParseError(
+        "Expected '{' after 'track'",
+        this.current,
+        this.source,
+        "Track handlers must be blocks"
+      );
+    }
+
     handler = this.block();
   }
 
@@ -185,17 +325,49 @@ doTrackStatement() {
 defineStatement() {
   const t = this.current; 
   this.eat('DEFINE');
+
+  if (this.current.type !== 'IDENTIFIER') {
+    throw new ParseError(
+      "Expected identifier after 'define'",
+      this.current,
+      this.source,
+      "Definitions must be followed by a name, e.g. define PI = 3.14"
+    );
+  }
+
   const idToken = this.current; 
   const id = idToken.value;
   this.eat('IDENTIFIER');
 
   let expr = null;
+
+  if (this.current.type === 'EQEQ') {
+    throw new ParseError(
+      "Invalid '==' in define statement",
+      this.current,
+      this.source,
+      "Did you mean '=' to assign a value?"
+    );
+  }
+
   if (this.current.type === 'EQUAL') {
     this.eat('EQUAL');
+
+    if (this.current.type === 'SEMICOLON') {
+      throw new ParseError(
+        "Expected expression after '='",
+        this.current,
+        this.source,
+        "Definitions require a value, e.g. define X = 10"
+      );
+    }
+
     expr = this.expression();
   }
 
-  if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
+  if (this.current.type === 'SEMICOLON') {
+    this.eat('SEMICOLON');
+  }
 
   return { 
     type: 'DefineStatement', 
@@ -208,30 +380,80 @@ defineStatement() {
 
 asyncFuncDeclaration() {
   const t = this.current;
+
+  if (this.current.type !== 'IDENTIFIER') {
+    throw new ParseError(
+      "Expected function name after 'async func'",
+      this.current,
+      this.source,
+      "Async functions must have a name"
+    );
+  }
+
   const name = this.current.value;
   this.eat('IDENTIFIER');
 
   let params = [];
+
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
+
     if (this.current.type !== 'RPAREN') {
+      if (this.current.type !== 'IDENTIFIER') {
+        throw new ParseError(
+          "Expected parameter name",
+          this.current,
+          this.source,
+          "Function parameters must be identifiers"
+        );
+      }
+
       params.push(this.current.value);
       this.eat('IDENTIFIER');
+
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
+
+        if (this.current.type !== 'IDENTIFIER') {
+          throw new ParseError(
+            "Expected parameter name after ','",
+            this.current,
+            this.source,
+            "Separate parameters with commas"
+          );
+        }
+
         params.push(this.current.value);
         this.eat('IDENTIFIER');
       }
     }
-    this.eat('RPAREN');
-  } else {
-    if (this.current.type === 'IDENTIFIER') {
-      params.push(this.current.value);
-      this.eat('IDENTIFIER');
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after function parameters",
+        this.current,
+        this.source,
+        "Did you forget to close the parameter list?"
+      );
     }
+
+    this.eat('RPAREN');
+  } else if (this.current.type === 'IDENTIFIER') {
+    params.push(this.current.value);
+    this.eat('IDENTIFIER');
+  }
+
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' to start function body",
+      this.current,
+      this.source,
+      "Function declarations require a block body"
+    );
   }
 
   const body = this.block();
+
   return { 
     type: 'FunctionDeclaration', 
     name, 
@@ -242,32 +464,62 @@ asyncFuncDeclaration() {
     column: t.column
   };
 }
-
 ifStatement() {
   const t = this.current;
   this.eat('IF');
 
   let test;
+
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
+
+    if (this.current.type === 'RPAREN') {
+      throw new ParseError(
+        "Missing condition in if statement",
+        this.current,
+        this.source,
+        "If statements require a condition"
+      );
+    }
+
     test = this.expression();
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after if condition",
+        this.current,
+        this.source,
+        "Did you forget to close the condition?"
+      );
+    }
+
     this.eat('RPAREN');
   } else {
     test = this.expression();
   }
 
+  if (this.current.type === 'EQUAL') {
+    throw new ParseError(
+      "Invalid assignment in if condition",
+      this.current,
+      this.source,
+      "Did you mean '==' for comparison?"
+    );
+  }
+
   const consequent = this.statementOrBlock();
 
   let alternate = null;
+
   if (this.current.type === 'ELSE') {
-  this.eat('ELSE');
-  if (this.current.type === 'IF') {
-    alternate = this.ifStatement();
-  } else {
-    alternate = this.statementOrBlock();
-  }
-}
+    this.eat('ELSE');
 
+    if (this.current.type === 'IF') {
+      alternate = this.ifStatement();
+    } else {
+      alternate = this.statementOrBlock();
+    }
+  }
 
   return { 
     type: 'IfStatement', 
@@ -278,6 +530,7 @@ ifStatement() {
     column: t.column 
   };
 }
+
 parseExpressionOnly() {
   return this.expression();
 }
@@ -290,13 +543,30 @@ whileStatement() {
 
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
+
+    if (this.current.type === 'RPAREN') {
+      throw new ParseError(
+        "Missing condition in while statement",
+        this.current,
+        this.source,
+        "While loops require a condition"
+      );
+    }
+
     test = this.expression();
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after while condition",
+        this.current,
+        this.source,
+        "Did you forget to close the condition?"
+      );
+    }
+
     this.eat('RPAREN');
   } 
   else {
-    const startPos = this.pos;
-    const startToken = this.current;
-
     const exprTokens = [];
     let braceFound = false;
     let depth = 0;
@@ -316,7 +586,8 @@ whileStatement() {
       throw new ParseError(
         "Expected '{' after while condition",
         this.current,
-        this.source
+        this.source,
+        "While loops must be followed by a block"
       );
     }
 
@@ -325,7 +596,17 @@ whileStatement() {
     test = exprParser.parseExpressionOnly(); 
   }
 
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' to start while loop body",
+      this.current,
+      this.source,
+      "While loop bodies must be enclosed in braces"
+    );
+  }
+
   const body = this.block();
+
   return { 
     type: 'WhileStatement', 
     test, 
@@ -335,21 +616,67 @@ whileStatement() {
   };
 }
 
-
 importStatement() {
   const t = this.current; 
   this.eat('IMPORT');
 
   let specifiers = [];
+
   if (this.current.type === 'STAR') {
     this.eat('STAR');
+
+    if (this.current.type !== 'AS') {
+      throw new ParseError(
+        "Expected 'as' after '*' in import",
+        this.current,
+        this.source,
+        "Namespace imports require 'as', e.g. import * as name from 'mod'"
+      );
+    }
+
     this.eat('AS');
+
+    if (this.current.type !== 'IDENTIFIER') {
+      throw new ParseError(
+        "Expected identifier after 'as'",
+        this.current,
+        this.source,
+        "The namespace must have a local name"
+      );
+    }
+
     const name = this.current.value;
     this.eat('IDENTIFIER');
-    specifiers.push({ type: 'NamespaceImport', local: name, line: t.line, column: t.column });
+
+    specifiers.push({
+      type: 'NamespaceImport',
+      local: name,
+      line: t.line,
+      column: t.column
+    });
+
   } else if (this.current.type === 'LBRACE') {
     this.eat('LBRACE');
+
+    if (this.current.type === 'RBRACE') {
+      throw new ParseError(
+        "Empty import specifier list",
+        this.current,
+        this.source,
+        "Specify at least one name inside '{ }'"
+      );
+    }
+
     while (this.current.type !== 'RBRACE') {
+      if (this.current.type !== 'IDENTIFIER') {
+        throw new ParseError(
+          "Expected identifier in import specifier",
+          this.current,
+          this.source,
+          "Import names must be identifiers"
+        );
+      }
+
       const importedName = this.current.value;
       const importedLine = this.current.line;
       const importedColumn = this.current.column;
@@ -358,27 +685,77 @@ importStatement() {
       let localName = importedName;
       if (this.current.type === 'AS') {
         this.eat('AS');
+
+        if (this.current.type !== 'IDENTIFIER') {
+          throw new ParseError(
+            "Expected identifier after 'as'",
+            this.current,
+            this.source,
+            "Aliases must be valid identifiers"
+          );
+        }
+
         localName = this.current.value;
         this.eat('IDENTIFIER');
       }
 
-      specifiers.push({ type: 'NamedImport', imported: importedName, local: localName, line: importedLine, column: importedColumn });
+      specifiers.push({
+        type: 'NamedImport',
+        imported: importedName,
+        local: localName,
+        line: importedLine,
+        column: importedColumn
+      });
+
       if (this.current.type === 'COMMA') this.eat('COMMA');
     }
+
     this.eat('RBRACE');
+
   } else if (this.current.type === 'IDENTIFIER') {
     const localName = this.current.value;
     const localLine = this.current.line;
     const localColumn = this.current.column;
     this.eat('IDENTIFIER');
-    specifiers.push({ type: 'DefaultImport', local: localName, line: localLine, column: localColumn });
+
+    specifiers.push({
+      type: 'DefaultImport',
+      local: localName,
+      line: localLine,
+      column: localColumn
+    });
+
   } else {
-    throw new Error(`Unexpected token in import at line ${this.current.line}, column ${this.current.column}`);
+    throw new ParseError(
+      "Invalid import syntax",
+      this.current,
+      this.source,
+      "Use import name, import { a }, or import * as name"
+    );
+  }
+
+  if (this.current.type !== 'FROM') {
+    throw new ParseError(
+      "Expected 'from' in import statement",
+      this.current,
+      this.source,
+      "Imports must specify a source module"
+    );
   }
 
   this.eat('FROM');
+
   const pathToken = this.current;
-  if (pathToken.type !== 'STRING') throw new Error(`Expected string after FROM at line ${this.current.line}, column ${this.current.column}`);
+
+  if (pathToken.type !== 'STRING') {
+    throw new ParseError(
+      "Expected string after 'from'",
+      pathToken,
+      this.source,
+      "Module paths must be strings"
+    );
+  }
+
   this.eat('STRING');
 
   if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
@@ -391,14 +768,14 @@ importStatement() {
     column: t.column 
   };
 }
-
 forStatement() {
-  const t = this.current; // FOR token
+  const t = this.current;
   this.eat('FOR');
 
-  if ((this.current.type === 'LET' && this.peekType() === 'IDENTIFIER' && this.peekType(2) === 'IN') ||
-      (this.current.type === 'IDENTIFIER' && this.peekType() === 'IN')) {
-
+  if (
+    (this.current.type === 'LET' && this.peekType() === 'IDENTIFIER' && this.peekType(2) === 'IN') ||
+    (this.current.type === 'IDENTIFIER' && this.peekType() === 'IN')
+  ) {
     let variable;
     let variableLine, variableColumn;
     let iterable;
@@ -407,22 +784,45 @@ forStatement() {
     if (this.current.type === 'LET') {
       letKeyword = true;
       this.eat('LET');
-      variableLine = this.current.line;
-      variableColumn = this.current.column;
-      variable = this.current.value;
-      this.eat('IDENTIFIER');
-      this.eat('IN');
-      iterable = this.expression();
-    } else {
-      variableLine = this.current.line;
-      variableColumn = this.current.column;
-      variable = this.current.value;
-      this.eat('IDENTIFIER');
-      this.eat('IN');
-      iterable = this.expression();
+    }
+
+    if (this.current.type !== 'IDENTIFIER') {
+      throw new ParseError(
+        "Expected identifier in for-in loop",
+        this.current,
+        this.source,
+        "for-in loops require a loop variable"
+      );
+    }
+
+    variableLine = this.current.line;
+    variableColumn = this.current.column;
+    variable = this.current.value;
+    this.eat('IDENTIFIER');
+
+    if (this.current.type !== 'IN') {
+      throw new ParseError(
+        "Expected 'in' in for-in loop",
+        this.current,
+        this.source,
+        "Use: for item in iterable { ... }"
+      );
+    }
+
+    this.eat('IN');
+    iterable = this.expression();
+
+    if (this.current.type !== 'LBRACE') {
+      throw new ParseError(
+        "Expected '{' after for-in iterable",
+        this.current,
+        this.source,
+        "For-in loops require a block body"
+      );
     }
 
     const body = this.block();
+
     return { 
       type: 'ForInStatement', 
       variable, 
@@ -444,25 +844,53 @@ forStatement() {
     this.eat('LPAREN');
 
     if (this.current.type !== 'SEMICOLON') {
-      init = this.current.type === 'LET' ? this.varDeclaration() : this.expressionStatement();
+      init = this.current.type === 'LET'
+        ? this.varDeclaration()
+        : this.expressionStatement();
     } else {
       this.eat('SEMICOLON');
     }
 
-    if (this.current.type !== 'SEMICOLON') test = this.expression();
+    if (this.current.type !== 'SEMICOLON') {
+      test = this.expression();
+    }
+
     this.eat('SEMICOLON');
 
-    if (this.current.type !== 'RPAREN') update = this.expression();
+    if (this.current.type !== 'RPAREN') {
+      update = this.expression();
+    }
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after for loop clauses",
+        this.current,
+        this.source,
+        "Did you forget to close the for loop header?"
+      );
+    }
+
     this.eat('RPAREN');
   } else {
-    init = this.expression();
-    if (this.current.type === 'IN') {
-      this.eat('IN');
-      test = this.expression(); // iterable
-    }
+    throw new ParseError(
+      "Expected '(' after 'for'",
+      this.current,
+      this.source,
+      "Classic for loops require parentheses"
+    );
+  }
+
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' to start for loop body",
+      this.current,
+      this.source,
+      "For loops require a block body"
+    );
   }
 
   const body = this.block();
+
   return { 
     type: 'ForStatement', 
     init, 
@@ -487,41 +915,111 @@ continueStatement() {
   if (this.current.type === 'SEMICOLON') this.advance();
   return { type: 'ContinueStatement', line: t.line, column: t.column };
 }
-
 funcDeclaration() {
   const t = this.current; 
   this.eat('FUNC');
+
+  if (this.current.type !== 'IDENTIFIER') {
+    throw new ParseError(
+      "Expected function name after 'func'",
+      this.current,
+      this.source,
+      "Functions must have a name, e.g. func add(a, b) { ... }"
+    );
+  }
+
   const nameToken = this.current;
   const name = nameToken.value;
   this.eat('IDENTIFIER');
 
   let params = [];
+
   if (this.current.type === 'LPAREN') {
     this.eat('LPAREN');
+
     if (this.current.type !== 'RPAREN') {
-      const paramToken = this.current;
-      params.push({ name: paramToken.value, line: paramToken.line, column: paramToken.column });
+      if (this.current.type !== 'IDENTIFIER') {
+        throw new ParseError(
+          "Expected parameter name",
+          this.current,
+          this.source,
+          "Function parameters must be identifiers"
+        );
+      }
+
+      let paramToken = this.current;
+      params.push({
+        name: paramToken.value,
+        line: paramToken.line,
+        column: paramToken.column
+      });
       this.eat('IDENTIFIER');
+
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
-        const paramToken2 = this.current;
-        params.push({ name: paramToken2.value, line: paramToken2.line, column: paramToken2.column });
+
+        if (this.current.type !== 'IDENTIFIER') {
+          throw new ParseError(
+            "Expected parameter name after ','",
+            this.current,
+            this.source,
+            "Each parameter must be an identifier"
+          );
+        }
+
+        paramToken = this.current;
+        params.push({
+          name: paramToken.value,
+          line: paramToken.line,
+          column: paramToken.column
+        });
         this.eat('IDENTIFIER');
       }
     }
-    this.eat('RPAREN');
-  } else {
-    if (this.current.type === 'IDENTIFIER') {
-      const paramToken = this.current;
-      params.push({ name: paramToken.value, line: paramToken.line, column: paramToken.column });
-      this.eat('IDENTIFIER');
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after function parameters",
+        this.current,
+        this.source,
+        "Did you forget to close the parameter list?"
+      );
     }
+
+    this.eat('RPAREN');
+  } 
+  else if (this.current.type === 'IDENTIFIER') {
+    const paramToken = this.current;
+    params.push({
+      name: paramToken.value,
+      line: paramToken.line,
+      column: paramToken.column
+    });
+    this.eat('IDENTIFIER');
+  }
+
+  if (this.current.type !== 'LBRACE') {
+    throw new ParseError(
+      "Expected '{' to start function body",
+      this.current,
+      this.source,
+      "Functions must have a block body"
+    );
   }
 
   const body = this.block();
-  return { type: 'FunctionDeclaration', name, params, body, line: t.line, column: t.column };
+
+  return {
+    type: 'FunctionDeclaration',
+    name,
+    params,
+    body,
+    line: t.line,
+    column: t.column
+  };
 }
 
+
 returnStatement() {
   const t = this.current; // RETURN token
   this.eat('RETURN');
@@ -541,18 +1039,35 @@ statementOrBlock() {
   }
   return this.statement();
 }
-
 block() {
   const t = this.current; // LBRACE token
   this.eat('LBRACE');
+
   const body = [];
+
   while (this.current.type !== 'RBRACE') {
+    if (this.current.type === 'EOF') {
+      throw new ParseError(
+        "Unterminated block",
+        this.current,
+        this.source,
+        "Did you forget to close the block with '}'?"
+      );
+    }
     body.push(this.statement());
   }
+
   this.eat('RBRACE');
-  return { type: 'BlockStatement', body, line: t.line, column: t.column };
+
+  return {
+    type: 'BlockStatement',
+    body,
+    line: t.line,
+    column: t.column
+  };
 }
 
+
 expressionStatement() {
   const exprToken = this.current;
   const expr = this.expression();
@@ -563,7 +1078,6 @@ expressionStatement() {
 expression() {
   return this.assignment();
 }
-
 assignment() {
   const node = this.ternary();
   const compoundOps = ['PLUSEQ', 'MINUSEQ', 'STAREQ', 'SLASHEQ', 'MODEQ'];
@@ -574,29 +1088,76 @@ assignment() {
     const op = t.type;
     this.eat(op);
     const right = this.assignment();
-    return { type: 'CompoundAssignment', operator: op, left: node, right, line: t.line, column: t.column };
+
+    return {
+      type: 'CompoundAssignment',
+      operator: op,
+      left: node,
+      right,
+      line: t.line,
+      column: t.column
+    };
+  }
+
+  if (t.type === 'EQEQ') {
+    throw new ParseError(
+      "Unexpected '==' in assignment",
+      t,
+      this.source,
+      "Did you mean '=' to assign a value?"
+    );
   }
 
   if (t.type === 'EQUAL') {
     this.eat('EQUAL');
     const right = this.assignment();
-    return { type: 'AssignmentExpression', left: node, right, line: t.line, column: t.column };
+
+    return {
+      type: 'AssignmentExpression',
+      left: node,
+      right,
+      line: t.line,
+      column: t.column
+    };
   }
 
   return node;
 }
+
 ternary() {
   let node = this.nullishCoalescing();
+
   while (this.current.type === 'QUESTION') {
     const t = this.current;
     this.eat('QUESTION');
-    const consequent = this.expression(); 
+
+    const consequent = this.expression();
+
+    if (this.current.type !== 'COLON') {
+      throw new ParseError(
+        "Expected ':' in conditional expression",
+        this.current,
+        this.source,
+        "Ternary expressions must follow the form: condition ? a : b"
+      );
+    }
+
     this.eat('COLON');
-    const alternate = this.expression();   
-    node = { type: 'ConditionalExpression', test: node, consequent, alternate, line: t.line, column: t.column };
+    const alternate = this.expression();
+
+    node = {
+      type: 'ConditionalExpression',
+      test: node,
+      consequent,
+      alternate,
+      line: t.line,
+      column: t.column
+    };
   }
+
   return node;
 }
+
 nullishCoalescing() {
   let node = this.logicalOr(); 
   while (this.current.type === 'NULLISH_COALESCING') {
@@ -679,6 +1240,16 @@ unary() {
   if (['NOT', 'MINUS', 'PLUS'].includes(t.type)) {
     const op = t.type;
     this.eat(op);
+
+    if (this.current.type === 'EOF') {
+      throw new ParseError(
+        "Missing operand for unary operator",
+        this.current,
+        this.source,
+        "Unary operators must be followed by an expression"
+      );
+    }
+
     return {
       type: 'UnaryExpression',
       operator: op,
@@ -691,7 +1262,18 @@ unary() {
   if (t.type === 'PLUSPLUS' || t.type === 'MINUSMINUS') {
     const op = t.type;
     this.eat(op);
+
     const argument = this.unary();
+
+    if (!argument || !argument.type) {
+      throw new ParseError(
+        "Invalid operand for update operator",
+        t,
+        this.source,
+        "Increment and decrement operators must apply to a variable"
+      );
+    }
+
     return {
       type: 'UpdateExpression',
       operator: op,
@@ -704,9 +1286,9 @@ unary() {
 
   return this.postfix();
 }
-
 postfix() {
   let node = this.primary();
+
   while (true) {
     const t = this.current;
 
@@ -714,9 +1296,27 @@ postfix() {
       const startLine = t.line;
       const startCol = t.column;
       this.eat('LBRACKET');
+
       const index = this.expression();
-      if (this.current.type === 'RBRACKET') this.eat('RBRACKET');
-      node = { type: 'IndexExpression', object: node, indexer: index, line: startLine, column: startCol };
+
+      if (this.current.type !== 'RBRACKET') {
+        throw new ParseError(
+          "Expected ']' after index expression",
+          this.current,
+          this.source,
+          "Index access must be closed, e.g. arr[0]"
+        );
+      }
+
+      this.eat('RBRACKET');
+
+      node = {
+        type: 'IndexExpression',
+        object: node,
+        indexer: index,
+        line: startLine,
+        column: startCol
+      };
       continue;
     }
 
@@ -724,13 +1324,46 @@ postfix() {
       const startLine = t.line;
       const startCol = t.column;
       this.eat('LPAREN');
+
       const args = [];
-      while (this.current.type !== 'RPAREN' && this.current.type !== 'EOF') {
+
+      while (this.current.type !== 'RPAREN') {
+        if (this.current.type === 'EOF') {
+          throw new ParseError(
+            "Unterminated function call",
+            this.current,
+            this.source,
+            "Did you forget to close ')'?"
+          );
+        }
+
         args.push(this.expression());
-        if (this.current.type === 'COMMA') this.eat('COMMA');
+
+        if (this.current.type === 'COMMA') {
+          this.eat('COMMA');
+        } else {
+          break;
+        }
       }
-      if (this.current.type === 'RPAREN') this.eat('RPAREN');
-      node = { type: 'CallExpression', callee: node, arguments: args, line: startLine, column: startCol };
+
+      if (this.current.type !== 'RPAREN') {
+        throw new ParseError(
+          "Expected ')' after function arguments",
+          this.current,
+          this.source,
+          "Function calls must be closed with ')'"
+        );
+      }
+
+      this.eat('RPAREN');
+
+      node = {
+        type: 'CallExpression',
+        callee: node,
+        arguments: args,
+        line: startLine,
+        column: startCol
+      };
       continue;
     }
 
@@ -738,21 +1371,46 @@ postfix() {
       const startLine = t.line;
       const startCol = t.column;
       this.eat('DOT');
-      const property = this.current.value || '';
-      if (this.current.type === 'IDENTIFIER') this.eat('IDENTIFIER');
-      node = { type: 'MemberExpression', object: node, property, line: startLine, column: startCol };
+
+      if (this.current.type !== 'IDENTIFIER') {
+        throw new ParseError(
+          "Expected property name after '.'",
+          this.current,
+          this.source,
+          "Member access requires a property name, e.g. obj.value"
+        );
+      }
+
+      const property = this.current.value;
+      this.eat('IDENTIFIER');
+
+      node = {
+        type: 'MemberExpression',
+        object: node,
+        property,
+        line: startLine,
+        column: startCol
+      };
       continue;
     }
 
     if (t.type === 'PLUSPLUS' || t.type === 'MINUSMINUS') {
       this.eat(t.type);
-      node = { type: 'UpdateExpression', operator: t.type, argument: node, prefix: false, line: t.line, column: t.column };
+
+      node = {
+        type: 'UpdateExpression',
+        operator: t.type,
+        argument: node,
+        prefix: false,
+        line: t.line,
+        column: t.column
+      };
       continue;
     }
 
-   
     break;
   }
+
   return node;
 }
 
@@ -764,10 +1422,19 @@ arrowFunction(params) {
   let isBlock = false;
 
   if (this.current.type === 'LBRACE') {
-    body = this.block();      
+    body = this.block();
     isBlock = true;
-  } else {
-    body = this.expression(); 
+  } 
+  else if (this.current.type === 'EOF') {
+    throw new ParseError(
+      "Missing arrow function body",
+      this.current,
+      this.source,
+      "Arrow functions require a body, e.g. x => x * 2"
+    );
+  } 
+  else {
+    body = this.expression();
   }
 
   const startLine = params.length > 0 ? params[0].line : t.line;
@@ -783,75 +1450,116 @@ arrowFunction(params) {
   };
 }
 
-
-  primary() {
+primary() {
   const t = this.current;
 
-  if (t.type === 'NUMBER') { 
-    this.eat('NUMBER'); 
-    return { type: 'Literal', value: t.value, line: t.line, column: t.column }; 
+  if (t.type === 'NUMBER') {
+    this.eat('NUMBER');
+    return { type: 'Literal', value: t.value, line: t.line, column: t.column };
   }
 
-  if (t.type === 'STRING') { 
-    this.eat('STRING'); 
-    return { type: 'Literal', value: t.value, line: t.line, column: t.column }; 
+  if (t.type === 'STRING') {
+    this.eat('STRING');
+    return { type: 'Literal', value: t.value, line: t.line, column: t.column };
   }
 
-  if (t.type === 'TRUE') { 
-    this.eat('TRUE'); 
-    return { type: 'Literal', value: true, line: t.line, column: t.column }; 
+  if (t.type === 'TRUE') {
+    this.eat('TRUE');
+    return { type: 'Literal', value: true, line: t.line, column: t.column };
   }
 
-  if (t.type === 'FALSE') { 
-    this.eat('FALSE'); 
-    return { type: 'Literal', value: false, line: t.line, column: t.column }; 
+  if (t.type === 'FALSE') {
+    this.eat('FALSE');
+    return { type: 'Literal', value: false, line: t.line, column: t.column };
   }
 
-  if (t.type === 'NULL') { 
-    this.eat('NULL'); 
-    return { type: 'Literal', value: null, line: t.line, column: t.column }; 
+  if (t.type === 'NULL') {
+    this.eat('NULL');
+    return { type: 'Literal', value: null, line: t.line, column: t.column };
   }
 
   if (t.type === 'AWAIT') {
     this.eat('AWAIT');
-    const argument = this.expression(); 
+    const argument = this.expression();
     return { type: 'AwaitExpression', argument, line: t.line, column: t.column };
   }
 
   if (t.type === 'NEW') {
     this.eat('NEW');
     const callee = this.primary();
+
+    if (this.current.type !== 'LPAREN') {
+      throw new ParseError(
+        "Expected '(' after 'new'",
+        this.current,
+        this.source,
+        "Use 'new ClassName(...)'"
+      );
+    }
+
     this.eat('LPAREN');
     const args = [];
     if (this.current.type !== 'RPAREN') {
       args.push(this.expression());
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
-        if (this.current.type !== 'RPAREN') args.push(this.expression());
+        if (this.current.type === 'RPAREN') break;
+        args.push(this.expression());
       }
     }
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' to close arguments for 'new'",
+        this.current,
+        this.source
+      );
+    }
+
     this.eat('RPAREN');
+
     return { type: 'NewExpression', callee, arguments: args, line: t.line, column: t.column };
   }
 
+  // ---- ask(...) function call ----
   if (t.type === 'ASK') {
     this.eat('ASK');
+
+    if (this.current.type !== 'LPAREN') {
+      throw new ParseError(
+        "Expected '(' after 'ask'",
+        this.current,
+        this.source
+      );
+    }
+
     this.eat('LPAREN');
     const args = [];
     if (this.current.type !== 'RPAREN') {
       args.push(this.expression());
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
-        if (this.current.type !== 'RPAREN') args.push(this.expression());
+        if (this.current.type === 'RPAREN') break;
+        args.push(this.expression());
       }
     }
+
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after arguments to 'ask'",
+        this.current,
+        this.source
+      );
+    }
+
     this.eat('RPAREN');
-    return { 
-      type: 'CallExpression', 
-      callee: { type: 'Identifier', name: 'ask', line: t.line, column: t.column }, 
-      arguments: args, 
-      line: t.line, 
-      column: t.column 
+
+    return {
+      type: 'CallExpression',
+      callee: { type: 'Identifier', name: 'ask', line: t.line, column: t.column },
+      arguments: args,
+      line: t.line,
+      column: t.column
     };
   }
 
@@ -870,89 +1578,120 @@ arrowFunction(params) {
     const startLine = t.line;
     const startCol = t.column;
     this.eat('LPAREN');
-    const elements = [];
 
+    const elements = [];
     if (this.current.type !== 'RPAREN') {
       elements.push(this.expression());
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
-        if (this.current.type !== 'RPAREN') elements.push(this.expression());
+        if (this.current.type === 'RPAREN') break;
+        elements.push(this.expression());
       }
     }
 
+    if (this.current.type !== 'RPAREN') {
+      throw new ParseError(
+        "Expected ')' after expression",
+        this.current,
+        this.source
+      );
+    }
+
     this.eat('RPAREN');
 
-    if (this.current.type === 'ARROW') return this.arrowFunction(elements);
+    if (this.current.type === 'ARROW') {
+      return this.arrowFunction(elements);
+    }
 
-    return elements.length === 1 ? elements[0] : { type: 'ArrayExpression', elements, line: startLine, column: startCol };
+    return elements.length === 1
+      ? elements[0]
+      : { type: 'ArrayExpression', elements, line: startLine, column: startCol };
   }
 
   if (t.type === 'LBRACKET') {
     const startLine = t.line;
     const startCol = t.column;
     this.eat('LBRACKET');
+
     const elements = [];
     if (this.current.type !== 'RBRACKET') {
       elements.push(this.expression());
       while (this.current.type === 'COMMA') {
         this.eat('COMMA');
-        if (this.current.type !== 'RBRACKET') elements.push(this.expression());
+        if (this.current.type === 'RBRACKET') break;
+        elements.push(this.expression());
       }
     }
+
+    if (this.current.type !== 'RBRACKET') {
+      throw new ParseError(
+        "Expected ']' after array elements",
+        this.current,
+        this.source
+      );
+    }
+
     this.eat('RBRACKET');
+
     return { type: 'ArrayExpression', elements, line: startLine, column: startCol };
   }
 
   if (t.type === 'LBRACE') {
-  const startLine = t.line;
-  const startCol = t.column;
-  this.eat('LBRACE');
+    const startLine = t.line;
+    const startCol = t.column;
+    this.eat('LBRACE');
 
-  const props = [];
+    const props = [];
 
-  while (this.current.type !== 'RBRACE') {
-    let key;
+    while (this.current.type !== 'RBRACE') {
+      if (this.current.type === 'EOF') {
+        throw new ParseError(
+          "Unterminated object literal",
+          this.current,
+          this.source,
+          "Did you forget to close '}'?"
+        );
+      }
 
-    if (this.current.type === 'IDENTIFIER') {
-      const k = this.current;
-      this.eat('IDENTIFIER');
-      key = {
-        type: 'Literal',
-        value: k.value,
-        line: k.line,
-        column: k.column
-      };
-    }
-    else if (this.current.type === 'STRING') {
-      const k = this.current;
-      this.eat('STRING');
-      key = {
-        type: 'Literal',
-        value: k.value,
-        line: k.line,
-        column: k.column
-      };
-    }
-    else {
-      throw new ParseError(
-        'Invalid object key',
-        this.current,
-        this.source
-      );
-    }
+      let key;
 
-    this.eat('COLON');
-    const value = this.expression();
+      if (this.current.type === 'IDENTIFIER') {
+        const k = this.current;
+        this.eat('IDENTIFIER');
+        key = { type: 'Literal', value: k.value, line: k.line, column: k.column };
+      } 
+      else if (this.current.type === 'STRING') {
+        const k = this.current;
+        this.eat('STRING');
+        key = { type: 'Literal', value: k.value, line: k.line, column: k.column };
+      } 
+      else {
+        throw new ParseError(
+          'Invalid object key',
+          this.current,
+          this.source,
+          "Object keys must be identifiers or strings"
+        );
+      }
 
-    props.push({ key, value });
+      if (this.current.type !== 'COLON') {
+        throw new ParseError(
+          "Expected ':' after object key",
+          this.current,
+          this.source
+        );
+      }
 
-    if (this.current.type === 'COMMA') this.eat('COMMA');
-  }
+      this.eat('COLON');
+      const value = this.expression();
+      props.push({ key, value });
 
-  this.eat('RBRACE');
-  return { type: 'ObjectExpression', props, line: startLine, column: startCol };
-}
+      if (this.current.type === 'COMMA') this.eat('COMMA');
+    }
 
+    this.eat('RBRACE');
+    return { type: 'ObjectExpression', props, line: startLine, column: startCol };
+  }
 
   throw new ParseError(
     `Unexpected token '${t.type}'`,
@@ -961,7 +1700,6 @@ arrowFunction(params) {
   );
 }
 
-
 }
 
 module.exports = Parser;