From 6b4a51f7ea49a6ef8305831e8d96b2a7cc4ba5f3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 22 Jan 2017 04:34:26 +0300
Subject: scripts: Make generate_vim_module more generic

---
 scripts/gencharblob.lua         | 48 +++++++++++++++++++++++++++++++++++++++++
 scripts/generate_vim_module.lua | 38 --------------------------------
 src/nvim/CMakeLists.txt         |  8 +++----
 3 files changed, 52 insertions(+), 42 deletions(-)
 create mode 100644 scripts/gencharblob.lua
 delete mode 100644 scripts/generate_vim_module.lua

diff --git a/scripts/gencharblob.lua b/scripts/gencharblob.lua
new file mode 100644
index 0000000000..d860375e26
--- /dev/null
+++ b/scripts/gencharblob.lua
@@ -0,0 +1,48 @@
+if arg[1] == '--help' then
+  print('Usage:')
+  print('  gencharblob.lua source target 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
+
+assert(#arg == 3)
+
+local source_file = arg[1]
+local target_file = arg[2]
+local varname = arg[3]
+
+source = io.open(source_file, 'r')
+target = io.open(target_file, 'w')
+
+target:write('#include <stdint.h>\n\n')
+target:write(('static const uint8_t %s[] = {\n'):format(varname))
+
+num_bytes = 0
+MAX_NUM_BYTES = 15  -- 78 / 5: maximum number of bytes on one line
+target:write(' ')
+
+increase_num_bytes = function()
+  num_bytes = num_bytes + 1
+  if num_bytes == MAX_NUM_BYTES then
+    num_bytes = 0
+    target:write('\n ')
+  end
+end
+
+for line in source:lines() do
+  for i = 1,string.len(line) do
+    byte = string.byte(line, i)
+    assert(byte ~= 0)
+    target:write(string.format(' %3u,', byte))
+    increase_num_bytes()
+  end
+  target:write(string.format(' %3u,', string.byte('\n', 1)))
+  increase_num_bytes()
+end
+
+target:write('   0};\n')
+
+source:close()
+target:close()
diff --git a/scripts/generate_vim_module.lua b/scripts/generate_vim_module.lua
deleted file mode 100644
index 954f1c38be..0000000000
--- a/scripts/generate_vim_module.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-assert(#arg == 2)
-
-module_file = arg[1]
-target_file = arg[2]
-
-module = io.open(module_file, 'r')
-target = io.open(target_file, 'w')
-
-target:write('#include <stdint.h>\n\n')
-target:write('static const uint8_t vim_module[] = {\n')
-
-num_bytes = 0
-MAX_NUM_BYTES = 15  -- 78 / 5: maximum number of bytes on one line
-target:write(' ')
-
-increase_num_bytes = function()
-  num_bytes = num_bytes + 1
-  if num_bytes == MAX_NUM_BYTES then
-    num_bytes = 0
-    target:write('\n ')
-  end
-end
-
-for line in module:lines() do
-  for i = 1,string.len(line) do
-    byte = string.byte(line, i)
-    assert(byte ~= 0)
-    target:write(string.format(' %3u,', byte))
-    increase_num_bytes()
-  end
-  target:write(string.format(' %3u,', string.byte('\n', 1)))
-  increase_num_bytes()
-end
-
-target:write('   0};\n')
-
-module:close()
-target:close()
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 7a7dbbcce6..21a39b950f 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -39,7 +39,7 @@ set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode)
 set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h)
 set(VIM_MODULE_FILE ${GENERATED_DIR}/viml/executor/vim_module.generated.h)
 set(VIM_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/src/nvim/viml/executor/vim.lua)
-set(VIM_MODULE_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/generate_vim_module.lua)
+set(CHAR_BLOB_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/gencharblob.lua)
 
 file(GLOB API_HEADERS api/*.h)
 file(GLOB MSGPACK_RPC_HEADERS msgpack_rpc/*.h)
@@ -222,10 +222,10 @@ add_custom_command(
 
 add_custom_command(
   OUTPUT ${VIM_MODULE_FILE}
-  COMMAND ${LUA_PRG} ${VIM_MODULE_GENERATOR} ${VIM_MODULE_SOURCE}
-                     ${VIM_MODULE_FILE}
+  COMMAND ${LUA_PRG} ${CHAR_BLOB_GENERATOR} ${VIM_MODULE_SOURCE}
+                     ${VIM_MODULE_FILE} vim_module
   DEPENDS
-    ${VIM_MODULE_GENERATOR}
+    ${CHAR_BLOB_GENERATOR}
     ${VIM_MODULE_SOURCE}
 )
 
-- 
cgit