Implement some very basic error handling

It's a little hacky and not very clean but it's
working for now.

bin/oslo.js

@@ -36,6 +36,10 @@ class OsloCLI {
       process.exit()
     }
 
+    if (output.error) {
+      this.error(output.error)
+    }
+
     if (opts.o) {
       const absoluteOutputPath = this.absolutePath(opts.o)
       if (opts.f || opts.e) {
@@ -126,6 +130,11 @@ class OsloCLI {
       oslo -d templates -o html`,
     )
   }
+
+  error(err) {
+    console.log(err.message)
+    process.exit()
+  }
 }
 
 new OsloCLI(args)

src/error.js

@@ -0,0 +1,7 @@
+module.exports = class Error {
+  constructor(opts) {
+    this.file = opts.file
+    this.line = opts.line
+    this.message = opts.message
+  }
+}

src/index.js

@@ -7,6 +7,11 @@ module.exports = function oslo(source, context) {
   const tokens = lexer.scan(source)
   const parser = new Parser(tokens)
   const tree = parser.parse()
+
+  if (tree.error) {
+    return tree
+  }
+
   const compiler = new Compiler(tree, context)
   return compiler.compile()
 }

src/parser.js

@@ -1,3 +1,4 @@
+const Error = require('./Error')
 const Node = require('./node')
 const tokenTypes = require('./tokenTypes')
 
@@ -10,6 +11,11 @@ module.exports = class Parser {
     let tree = []
     while (this.tokenStream.peek().type !== tokenTypes.EOF) {
       tree.push(this.expr())
+      if (this.tokenStream.error) {
+        return {
+          error: this.tokenStream.error,
+        }
+      }
     }
     return tree
   }
@@ -23,6 +29,8 @@ module.exports = class Parser {
       this.tokenStream.peek().type !== tokenTypes.CPAREN &&
       this.tokenStream.peek().type !== tokenTypes.EOF
     ) {
+      if (this.tokenStream.error) return
+
       if (this.tokenStream.peek().type === tokenTypes.LITERAL) {
         node = this.element()
       } else if (this.tokenStream.peek().type === tokenTypes.KEYWORD) {
@@ -48,6 +56,8 @@ module.exports = class Parser {
         this.tokenStream.peek().type,
       )
     ) {
+      if (this.tokenStream.error) return
+
       if (this.tokenStream.peek().type === tokenTypes.ATTRIBUTE) {
         elementNode.args.push(this.attribute())
       } else if (this.tokenStream.peek().type === tokenTypes.QUOTE) {
@@ -71,6 +81,12 @@ module.exports = class Parser {
       attributeNode.attributeValue = this.quotedString()
     } else if (this.tokenStream.peek().type === tokenTypes.LITERAL) {
       attributeNode.attributeValue = this.identifier()
+    } else {
+      let token = this.tokenStream.peek()
+      this.tokenStream.error = new Error({
+        line: token.line,
+        message: `Encountered an unexpected ${token.type} while looking for a string or identifier.`
+      })
     }
 
     return attributeNode

src/tokenStream.js

@@ -1,3 +1,5 @@
+const Error = require('./error')
+
 module.exports = class TokenStream {
   constructor() {
     this.tokens = []
@@ -9,11 +11,19 @@ module.exports = class TokenStream {
   }
 
   eat(tokenType) {
-    if (this.peek() && this.peek().type === tokenType) {
+    let token = this.peek()
+
+    if (token && token.type === tokenType) {
       this.advance()
-      return this.peek(-1)
+      return token
     }
-    return false
+
+    this.error = new Error({
+      line: token.line,
+      message: `Encountered an unexpected ${
+        token.type
+      } while looking for a ${tokenType}.`,
+    })
   }
 
   peek(step = 0) {

src/tokenTypes.js

@@ -6,5 +6,5 @@ module.exports = {
   LITERAL: 'literal',
   ATTRIBUTE: 'attribute',
   SYMBOL: 'symbol',
-  EOF: 'eof',
+  EOF: 'EOF',
 }

test/parser.js

@@ -41,3 +41,35 @@ test('parses token stream into a tree', t => {
     }),
   ])
 })
+
+test('missing close paren returns an error', function(t) {
+  t.plan(2)
+  const lexer = new Lexer()
+  let tokenStream = lexer.scan(`
+    (div :class "foobar"
+  `)
+  let parser = new Parser(tokenStream)
+  let tree = parser.parse()
+  t.equal(tree.error.constructor.name, 'Error')
+  t.deepEqual(tree.error, {
+    file: undefined,
+    line: 3,
+    message: 'Encountered an unexpected EOF while looking for a ).',
+  })
+})
+
+test('unexpected attribute return an error', function(t) {
+  t.plan(2)
+  const lexer = new Lexer()
+  let tokenStream = lexer.scan(`
+    (div :class :id)
+  `)
+  let parser = new Parser(tokenStream)
+  let tree = parser.parse()
+  t.equal(tree.error.constructor.name, 'Error')
+  t.deepEqual(tree.error, {
+    file: undefined,
+    line: 2,
+    message: 'Encountered an unexpected attribute while looking for a string or identifier.',
+  })
+})