bootstrap

internal/bootstrap.cm

@@ -22,14 +22,16 @@ function use_basic(path) {
   return result
 }
 
-var tok_ast_path = core_path + "/tokenize.ast.json"
-var par_ast_path = core_path + "/parse.ast.json"
+var tok_ast_path = "tokenize.ast.json"
+var par_ast_path = "parse.ast.json"
 var tokenize_mod = mach_eval_ast("tokenize", text(fd.slurp(tok_ast_path)), {use: use_basic})
 var parse_mod = mach_eval_ast("parse", text(fd.slurp(par_ast_path)), {use: use_basic})
+var fold_ast_path = "fold.ast.json"
+var fold_mod = mach_eval_ast("fold", text(fd.slurp(fold_ast_path)), {use: use_basic})
 
 // Optionally load mcode compiler module
 var mcode_mod = null
-var mcode_ast_path = core_path + "/mcode.ast.json"
+var mcode_ast_path = "mcode.ast.json"
 if (use_mcode) {
   mcode_mod = mach_eval_ast("mcode", text(fd.slurp(mcode_ast_path)), {use: use_basic})
 }
@@ -65,6 +67,7 @@ function analyze(src, filename) {
     }
     disrupt
   }
+  ast = fold_mod(ast)
   return ast
 }