Redo map as each, still playing with the syntax

src/compiler.js

@@ -28,7 +28,7 @@ module.exports = class Compiler {
         this.result += node.content
       } else if (node.type === 'identifier') {
         this.result += this.lookup(node.name)
-      } else if (node.type === 'map') {
+      } else if (node.type === 'each') {
         const symbol = node.symbol.value
         const subject = this.lookup(node.subject.name)
         subject.forEach(item => {

src/lexer.js

@@ -58,7 +58,7 @@ module.exports = class Lexer {
 
         let value = endPattern.exec(source.slice(pos))[0].trim()
 
-        if (['if', 'map'].includes(value)) {
+        if (['if', 'each'].includes(value)) {
           tokenStream.tokens.push({
             type: tokenTypes.KEYWORD,
             line: line,

src/parser.js

@@ -77,12 +77,12 @@ module.exports = class Parser {
   keyword() {
     const keyword = this.tokenStream.eat(tokenTypes.KEYWORD)
 
-    if (keyword.value === 'map') {
+    if (keyword.value === 'each') {
+      const subject = this.identifier()
       const symbol = this.tokenStream.eat(tokenTypes.SYMBOL)
       const body = this.expr()
-      const subject = this.identifier()
       return new Node({
-        type: 'map',
+        type: 'each',
         symbol: symbol,
         body: body,
         subject: subject,

test/compiler.js

@@ -49,7 +49,7 @@ test('compiles map operations', function(t) {
   const lexer = new Lexer()
   const tokenStream = lexer.scan(`
     (ul
-      (map 'item (li item) items))
+      (each items 'item (li item)))
   `)
   const parser = new Parser(tokenStream)
   const tree = parser.parse()