Implement missing closing “/) errors

src/index.js

@@ -11,8 +11,8 @@ module.exports = function oslo(source, context) {
   const parser = new Parser()
   const tree = parser.parse(tokens)
 
-  if (tree.error) {
-    return tree.error
+  if (tree.constructor == OsloError) {
+    return tree
   }
 
   const evaluator = new Evaluator()

src/parser.js

@@ -8,13 +8,18 @@ module.exports = class Parser {
     let tree = []
     while (this.tokenStream.peek().type !== tokenTypes.EOF) {
       let expr = this.expr()
-      tree.push(expr)
+
       if (this.tokenStream.error) {
-        return {
-          error: this.tokenStream.error,
-        }
+        break
       }
+
+      tree.push(expr)
     }
+
+    if (this.tokenStream.error) {
+      return this.tokenStream.error
+    }
+
     return tree
   }
 
@@ -67,9 +72,13 @@ module.exports = class Parser {
 
       node.args = []
 
-      while (this.tokenStream.peek().type !== tokenTypes.CPAREN) {
+      while (this.tokenStream.peek().type !== tokenTypes.CPAREN && this.tokenStream.peek().type != tokenTypes.EOF) {
         node.args.push(this.expr())
       }
+
+      if (this.tokenStream.error) {
+        return this.tokenStream.error
+      }
     }
 
     this.tokenStream.eat(tokenTypes.CPAREN)

test/parserTest.js

@@ -2,6 +2,7 @@ const test = require('tape')
 const helpers = require('./helpers')
 
 const AST = require('../src/ast')
+const OsloError = require('../src/osloError')
 const tt = require('../src/tokenTypes')
 
 test('parses token stream into a tree', t => {
@@ -88,3 +89,29 @@ test('parse conditionals', t => {
     }),
   ])
 })
+
+test('missing close paren returns error', t => {
+  t.plan(1)
+  const tree = helpers.parse('(p ""')
+
+  t.deepEqual(
+    tree,
+    new OsloError({
+      line: 1,
+      message: 'Encountered an unexpected EOF while looking for a ).',
+    })
+  )
+})
+
+test('missing close quote returns an error', t => {
+  t.plan(1)
+  const tree = helpers.parse('(p "hello world)')
+
+  t.deepEqual(
+    tree,
+    new OsloError({
+      line: 1,
+      message: 'Encountered an unexpected EOF while looking for a ".',
+    })
+  )
+})