Rework functions and add everything you need for a rudimentary FizzBuzz

compiler.js

@@ -29,6 +29,14 @@ var tokenizer = function (input) {
       pos++
       continue
     }
+    if (char === '|') {
+      tokens.push({
+        type: 'bar',
+        value: char
+      })
+      pos++
+      continue
+    }
     let whitespace = /[;\s]/
     if (whitespace.test(char)) {
       if (char === ';') {
@@ -140,6 +148,14 @@ var parser = function (input) {
       }
     }
 
+    if (token.type === 'bar') {
+      pos++
+      return {
+        type: 'BarLiteral',
+        value: token.value
+      }
+    }
+
     if (token.type === 'string') {
       pos++
       return {
@@ -213,6 +229,8 @@ var traverser = function (ast, visitor) {
         break
       case 'DollarVar':
         break
+      case 'BarLiteral':
+        break
       default:
         throw {
           name: 'Compiler Error',
@@ -246,6 +264,12 @@ var transformer = function (ast) {
         value: node.value
       })
     },
+    BarLiteral: function (node, parent) {
+      parent._context.push({
+        type: 'BarLiteral',
+        value: node.value
+      })
+    },
     VariableReference: function (node, parent) {
       parent._context.push({
         type: 'VariableReference',
@@ -282,7 +306,7 @@ var transformer = function (ast) {
   return newAst
 }
 
-
+var escapeDepth = 0
 var generator = function (node) {
 
   switch (node.type) {
@@ -295,7 +319,7 @@ var generator = function (node) {
       return (generator(node.expr) + ';')
       break
     case 'FunctionCall':
-      if (node.callee.name !== 'def') {
+      if (!node.callee.name.match('(def|if|repeat)')) {
         return (generator(node.callee) + '(' + node.args.map(generator).join(', ') + ')')
       } else {
         return (generator(node.callee) + '(' + node.args.map((v, i) => {
@@ -303,22 +327,25 @@ var generator = function (node) {
             return generator(v) + ', '
           } else {
             if (i === 1) {
-              return "'" + generator(v) + '; '
+              return 'function() {' + generator(v) + ';'
             } else {
               return generator(v) + '; '
             }
           }
-        }).join('') + "')")
+        }).join('') + '})')
       }
       break;
     case 'DollarVar':
-      return '$' + node.value
+      return 'arguments[' + (+node.value-1) + ']'
+      break
+    case 'BarLiteral':
+      return '}, function() {'
       break
     case 'FunctionName':
       return '_.' + node.name
       break
     case 'VariableReference':
-      return '_.ref("' + node.value + '")'
+      return '_.ref(\'' + node.value + '\')'
       break
     case 'NumberLiteral':
       return '{value: ' + node.value + '}'
@@ -338,6 +365,8 @@ var generator = function (node) {
 
 
 // const myInput = '(assign twelve 12) (assign myvar (add twelve (subtract 6 2))) (log myvar)'
+const fileNameIn = process.argv[2]
+const fileNameOut = fileNameIn + '.js'
 const myInput = fs.readFileSync(process.argv[2], { encoding: 'utf-8' })
 const preProcessedInput = preprocess(myInput)
 const myTokens = tokenizer(preProcessedInput)
@@ -345,4 +374,4 @@ const parsedTree = parser(myTokens)
 const transformedTree = transformer(parsedTree)
 //console.log(JSON.stringify(transformedTree,null,2))
 const output = generator(transformedTree)
-fs.writeFileSync('output.js', output)
+fs.writeFileSync(fileNameOut, output)

example.mc

@@ -28,3 +28,7 @@
 ngs without stupid escape 
 
 characters")
+(repeat 5 (log 10))
+(log scopelol)
+(repeat scopelol (log 10))
+(if (eq 2 scopelol) (log "2 == scopelol") | (log "2 != scopelol"))

fizzbuzz.mc

@@ -0,0 +1,10 @@
+(def fizzbuzz
+  (assign i 1)
+  (repeat $1
+    (if (eq (modulo i 3) 0) (if (eq (modulo i 5) 0) (log "FizzBuzz") | (log "Fizz")))
+    (if (eq (modulo i 5) 0) (log "Buzz") | (log i))
+    (assign i (add i 1))
+  )
+)
+
+(fizzbuzz 100)

stdlib.js

@@ -34,6 +34,35 @@ const builtins = {
       console.warn("Warning! Redefining function, did you mean to do this?")
     }
     function_defs[prop.name] = body;
+  },
+  repeat: function (amount, body) {
+    for (i = 0 ; i < amount.value; i++) {
+        body() 
+    }
+  },
+  eQ: function (arg1, arg2) {
+    return {
+      value: arg1.value === arg2.value
+    }
+  },
+  eq: function (arg1, arg2) {
+    return {
+      value: arg1.value == arg2.value
+    }
+  },
+  if: function (pred, body_true, body_false) {
+    if (pred.value) {
+      body_true()
+    } else {
+      if (body_false) {
+        body_false()
+      }
+    }
+  },
+  modulo: function (arg1, arg2) {
+    return {
+      value: (arg1.value % arg2.value)
+    }
   }
 }
 
@@ -46,7 +75,8 @@ const my_handler = {
     } else {
       methods = Object.keys(function_defs)
       if (methods.includes(prop)) {
-        return (function () { eval(function_defs[prop].replace(/\$(\d+)/g, (m, n) => JSON.stringify(arguments[(+n-1)]))) })
+        //return (function () { eval(function_defs[prop].replace(/\$(\d+)/g, (m, n) => JSON.stringify(arguments[(+n-1)]))) })
+        return function_defs[prop]
       } else {
         console.error("Undefined function call! No such function: ", prop)
       }