pull out prettify mcode

regen.ce

@@ -49,7 +49,6 @@ var ast = null
 var folded = null
 var mcode_blob = null
 var hash = null
-var compact_mcode = null
 var mach_blob = null
 var compiled = null
 var optimized = null
@@ -60,88 +59,6 @@ var ei = 0
 var e = null
 var had_errors = false
 
-// Collapse leaf arrays (instruction arrays) onto single lines
-var compact_arrays = function(json_text) {
-  var lines = array(json_text, "\n")
-  var result = []
-  var i = 0
-  var line = null
-  var trimmed = null
-  var collecting = false
-  var collected = null
-  var indent = null
-  var is_leaf = null
-  var j = 0
-  var inner = null
-  var parts = null
-  var trailing = null
-  var chars = null
-  var k = 0
-
-  while (i < length(lines)) {
-    line = lines[i]
-    trimmed = trim(line)
-    if (collecting == false && trimmed == "[") {
-      collecting = true
-      chars = array(line)
-      k = 0
-      while (k < length(chars) && chars[k] == " ") {
-        k = k + 1
-      }
-      indent = text(line, 0, k)
-      collected = []
-      i = i + 1
-      continue
-    }
-    if (collecting) {
-      if (trimmed == "]" || trimmed == "],") {
-        is_leaf = true
-        j = 0
-        while (j < length(collected)) {
-          inner = trim(collected[j])
-          if (starts_with(inner, "[") || starts_with(inner, "{")) {
-            is_leaf = false
-          }
-          j = j + 1
-        }
-        if (is_leaf && length(collected) > 0) {
-          parts = []
-          j = 0
-          while (j < length(collected)) {
-            inner = trim(collected[j])
-            if (ends_with(inner, ",")) {
-              inner = text(inner, 0, length(inner) - 1)
-            }
-            parts[] = inner
-            j = j + 1
-          }
-          trailing = ""
-          if (ends_with(trimmed, ",")) {
-            trailing = ","
-          }
-          result[] = `${indent}[${text(parts, ", ")}]${trailing}`
-        } else {
-          result[] = `${indent}[`
-          j = 0
-          while (j < length(collected)) {
-            result[] = collected[j]
-            j = j + 1
-          }
-          result[] = line
-        }
-        collecting = false
-      } else {
-        collected[] = line
-      }
-      i = i + 1
-      continue
-    }
-    result[] = line
-    i = i + 1
-  }
-  return text(result, "\n")
-}
-
 while (i < length(files)) {
   entry = files[i]
   src = text(fd.slurp(entry.src))
@@ -167,7 +84,7 @@ while (i < length(files)) {
   folded = fold(ast)
   compiled = mcode(folded)
   optimized = streamline(compiled)
-  mcode_text = compact_arrays(json.encode(optimized, null, 2))
+  mcode_text = json.encode(optimized)
   f = fd.open(entry.out, "w")
   fd.write(f, mcode_text)
   fd.close(f)
@@ -176,8 +93,7 @@ while (i < length(files)) {
   if (cache_dir) {
     mcode_blob = stone(blob(mcode_text))
     hash = text(crypto.blake2(mcode_blob), 'h')
-    compact_mcode = json.encode(optimized)
-    mach_blob = mach_compile_mcode_bin(entry.name, compact_mcode)
+    mach_blob = mach_compile_mcode_bin(entry.name, mcode_text)
     fd.slurpwrite(cache_dir + '/' + hash + '.mach', mach_blob)
     print(`  cached ${hash}.mach`)
   }