demo/real.dee

@@ -2,7 +2,7 @@
 fizzbuzz <- x ->
   if x % 15 = 0 print("fizzbuzz")
   elif x % 3 = 0 print("fizz")
-  elif x % 5 = 0 print("buzz")
+  # elif x % 5 = 0 print("buzz")
   else print(x)
   if x < 100 fizzbuzz(x + 1) ## TODO add looping construct(s)
   

src/emitter.rs

@@ -37,13 +37,6 @@ impl <'a> LexicalContext<'a> {
     }
 }
 
-/// Embeds the pre-written js
-pub fn emit_injector(w: &mut dyn Write) -> std::io::Result<()>{
-    let bytes = include_bytes!("./js/deeinject.js");
-    write!(w, "{}", String::from_utf8_lossy(bytes))?;
-    Ok(())
-}
-
 pub fn emit_all(w: &mut dyn Write, ast: &Vec<parser::Stmt>, ctx: &mut LexicalContext) -> std::io::Result<()> {
     let is_tail = ctx.is_tail;
     ctx.is_tail = false;
@@ -120,18 +113,15 @@ pub fn emit_expr(w: &mut dyn Write, expr: &parser::Expr, ctx: &mut LexicalContex
 	    write!(w, "{}", atom)?;
 	}
 	parser::Expr::Funcall(id, args) => {
-	    if let Some((last, butlast)) = args.split_last() {
+	    write!(w, "{}", munge(id))?;
-		write!(w, "T({}, ", munge(id))?;
+	    if args.is_empty() {
-		for expr in butlast {
-		    emit_expr(w, expr, ctx)?;
-		    write!(w, ", ")?;
-		}
-		emit_expr(w, last, ctx)?;
-		write!(w, ")")?;
-	    } else {
-		write!(w, "{}", munge(id))?;
 		write!(w, "()")?;
 	    }
+	    for arg in args {
+		write!(w, "(")?;
+		emit_expr(w, arg, ctx)?;
+		write!(w, ")")?;
+	    }
 	}
 	parser::Expr::Funcdef(arg, body) => {
 	    if let Some(arg) = arg {

src/js/deeinject.js

@@ -1,10 +0,0 @@
-const print = console.log
-
-function T(f, ...args) {
-  let res = f;
-  for (arg of args) {
-    res = res(arg);
-  }
-  return res;
-}
-  

src/main.rs

@@ -53,7 +53,8 @@ fn script(cli: &Cli) {
         println!("{:#?}", tree);
     } else if cli.ecmascript {
 	let mut out = io::stdout();
-	emitter::emit_injector(&mut out).ok();
+	// TODO remove this hack
+	writeln!(out, "const print = console.log;").ok();
 	let mut toplevel = emitter::LexicalContext::toplevel();
 	emitter::emit_all(&mut out, &tree, &mut toplevel).ok();
     } else {