1 files changed, 38 insertions, 14 deletions
diff --git a/src/nvim/generators/gen_char_blob.lua b/src/nvim/generators/gen_char_blob.lua
index a7dad50d48..3ec1ff2caf 100644
--- a/src/nvim/generators/gen_char_blob.lua
+++ b/src/nvim/generators/gen_char_blob.lua
@@ -1,12 +1,26 @@
 if arg[1] == '--help' then
   print('Usage:')
-  print('  '..arg[0]..' target source varname [source varname]...')
+  print('  '..arg[0]..' [-c] target source varname [source varname]...')
   print('')
   print('Generates C file with big uint8_t blob.')
   print('Blob will be stored in a static const array named varname.')
   os.exit()
 end
 
+-- Recognized options:
+--   -c   compile Lua bytecode
+local options = {}
+
+while true do
+  local opt = string.match(arg[1], "^-(%w)")
+  if not opt then
+    break
+  end
+
+  options[opt] = true
+  table.remove(arg, 1)
+end
+
 assert(#arg >= 3 and (#arg - 1) % 2 == 0)
 
 local target_file = arg[1] or error('Need a target file')
@@ -14,6 +28,7 @@ local target = io.open(target_file, 'w')
 
 target:write('#include <stdint.h>\n\n')
 
+local warn_on_missing_compiler = true
 local varnames = {}
 for argi = 2, #arg, 2 do
   local source_file = arg[argi]
@@ -23,11 +38,26 @@ for argi = 2, #arg, 2 do
   end
   varnames[varname] = source_file
 
-  local source = io.open(source_file, 'r')
-      or error(string.format("source_file %q doesn't exist", source_file))
-
   target:write(('static const uint8_t %s[] = {\n'):format(varname))
 
+  local output
+  if options.c then
+    local luac = os.getenv("LUAC_PRG")
+    if luac and luac ~= "" then
+      output = io.popen(luac:format(source_file), "r"):read("*a")
+    elseif warn_on_missing_compiler then
+      print("LUAC_PRG is missing, embedding raw source")
+      warn_on_missing_compiler = false
+    end
+  end
+
+  if not output then
+    local source = io.open(source_file, "r")
+        or error(string.format("source_file %q doesn't exist", source_file))
+    output = source:read("*a")
+    source:close()
+  end
+
   local num_bytes = 0
   local MAX_NUM_BYTES = 15  -- 78 / 5: maximum number of bytes on one line
   target:write(' ')
@@ -41,19 +71,13 @@ for argi = 2, #arg, 2 do
     end
   end
 
-  for line in source:lines() do
-    for i = 1, string.len(line) do
-      local byte = line:byte(i)
-      assert(byte ~= 0)
-      target:write(string.format(' %3u,', byte))
-      increase_num_bytes()
-    end
-    target:write(string.format(' %3u,', string.byte('\n', 1)))
+  for i = 1, string.len(output) do
+    local byte = output:byte(i)
+    target:write(string.format(' %3u,', byte))
     increase_num_bytes()
   end
 
-  target:write('   0};\n')
-  source:close()
+  target:write('  0};\n')
 end
 
 target:close()