Fix broken lexer test

src/lexer.js

@@ -5,30 +5,30 @@ module.exports = class Lexer {
   scan(source) {
     let pos = 0
     let line = 1
-    let tokens = new TokenStream()
+    let tokenStream = new TokenStream()
 
     while (pos < source.length) {
       if (source[pos].match(/\(/)) {
-        tokens.push({
+        tokenStream.tokens.push({
           type: tokenTypes.OPAREN,
           line: line,
         })
         pos++
       } else if (source[pos].match(/\)/)) {
-        tokens.push({
+        tokenStream.tokens.push({
           type: tokenTypes.CPAREN,
           line: line,
         })
         pos++
       } else if (source[pos].match(/['"]/)) {
-        tokens.push({
+        tokenStream.tokens.push({
           type: tokenTypes.QUOTE,
           line: line,
         })
         pos++
       } else if (source[pos].match(/:/)) {
         let value = /:([^()'"\s]+)/.exec(source.slice(pos))[1].trim()
-        tokens.push({
+        tokenStream.tokens.push({
           type: tokenTypes.ATTRIBUTE,
           line: line,
           value: value,
@@ -41,7 +41,7 @@ module.exports = class Lexer {
         pos++
       } else {
         let value = /[^()"':]+/.exec(source.slice(pos))[0]
-        tokens.push({
+        tokenStream.tokens.push({
           type: tokenTypes.LITERAL,
           line: line,
           value: value.trim(),
@@ -50,10 +50,10 @@ module.exports = class Lexer {
       }
     }
 
-    tokens.push({
+    tokenStream.tokens.push({
       type: tokenTypes.EOF,
       line: line,
     })
-    return tokens
+    return tokenStream
   }
 }

src/tokenStream.js

@@ -1,6 +1,7 @@
 module.exports = class TokenStream extends Array {
   constructor() {
     super()
+    this.tokens = []
     this.position = 0
   }
 
@@ -17,6 +18,6 @@ module.exports = class TokenStream extends Array {
   }
 
   peek(step = 0) {
-    return this[this.position + step]
+    return this.tokens[this.position + step]
   }
 }

test/lexer.js

@@ -8,7 +8,7 @@ test('lexes simple template correctly', t => {
   const lexer = new Lexer()
   let tokens = lexer.scan(
     '(div :class "foobar" (p "Lorem ipsum dolor sit amet"))',
-  )
+  ).tokens
   t.deepEqual(tokens.map(token => token.type), [
     tt.OPAREN,
     tt.LITERAL,
@@ -36,7 +36,7 @@ test('keeps track of line numbers', t => {
   let tokens = lexer.scan(`(
     (div :class "foobar"
       (p :class "bazquux"))
-  `)
+  `).tokens
   t.equal(tokens[2].line, 2)
   t.equal(tokens[7].line, 3)
 })