[!] Branch for lua v5.1.

Author: Ian

lcf-scm-1.rockspec renamed to lcf-5.1-0.rockspec

@@ -1,8 +1,9 @@
 package = 'lcf'
-version = 'scm-1'
+version = '5.1-0'
 
 source = {
   url = 'git://github.com/martin-eden/lua_code_formatter.git',
+  tag = '5.1-0',
 }
 
 description = {
@@ -18,7 +19,7 @@ easy to understand form, not the shortest one.
 }
 
 dependencies = {
-  'lua ~> 5.3',
+  'lua == 5.1',
 }
 
 build = {
@@ -113,7 +114,6 @@ build = {
     ['lcf.workshop.file.as_string'] = 'workshop/file/as_string.lua',
     ['lcf.workshop.file.exists'] = 'workshop/file/exists.lua',
     ['lcf.workshop.file.get_size'] = 'workshop/file/get_size.lua',
-    ['lcf.workshop.file.get_unique_name'] = 'workshop/file/get_unique_name.lua',
     ['lcf.workshop.file.safe_open'] = 'workshop/file/safe_open.lua',
     ['lcf.workshop.file.text_file_as_string'] = 'workshop/file/text_file_as_string.lua',
     ['lcf.workshop.graph.assembly_order'] = 'workshop/graph/assembly_order.lua',
@@ -126,8 +126,7 @@ build = {
     ['lcf.workshop.handy_mechs.new'] = 'workshop/handy_mechs/new.lua',
     ['lcf.workshop.handy_mechs.number_representer'] = 'workshop/handy_mechs/number_representer.lua',
     ['lcf.workshop.handy_mechs.override_params'] = 'workshop/handy_mechs/override_params.lua',
-    ['lcf.workshop.handy_mechs.string_adders.any'] = 'workshop/handy_mechs/string_adders/any.lua',
-    ['lcf.workshop.handy_mechs.string_adders.file'] = 'workshop/handy_mechs/string_adders/file.lua',
+    ['lcf.workshop.handy_mechs.string_adders.array'] = 'workshop/handy_mechs/string_adders/array.lua',
     ['lcf.workshop.load_from.generic_loader'] = 'workshop/load_from/generic_loader.lua',
     ['lcf.workshop.load_from.lua'] = 'workshop/load_from/lua.lua',
     ['lcf.workshop.load_from.lua.serialize_table.lua_code'] = 'workshop/load_from/lua/serialize_table/lua_code.lua',

workshop/base.lua

@@ -26,19 +26,16 @@ do
         end
       end
   end
-  _G.is_integer = function(n) return (math.type(n) == 'integer') end
-  _G.assert_integer =
-    function(a, responsibility_level)
-      local responsibility_level = (responsibility_level or 1)
-      if (math.type(a) ~= 'integer') then
-        error(('Argument must be integer, not %s.'):format(type(a)), responsibility_level + 1)
-      end
-    end
 end
 
 -- Make sure we have table.pack and table.unpack:
 do
-  _G.table.pack = _G.table.pack or _G.pack
+  _G.table.pack =
+    _G.table.pack or
+    _G.pack or
+    function(...)
+      return {n = select('#', ...), ...}
+    end
   _G.table.unpack = _G.table.unpack or _G.unpack
 end
 

workshop/compile/lua/serialize_table/lua_table/interface.lua

@@ -6,7 +6,7 @@ return
     always_index_keys = false,
     name_giver = request('^.^.^.^.handy_mechs.name_giver'),
     table_iterator = request('^.^.^.^.table.ordered_pass'),
-    string_adder = request('^.^.^.^.handy_mechs.string_adders.any'),
+    string_adder = request('^.^.^.^.handy_mechs.string_adders.array'),
     token_giver = request('^.^.token_givers.any'),
     quote_string = request('^.^.quote_string'),
     serialize_key = request('serialize_key'),

workshop/compile/lua/token_givers/readable.lua

@@ -14,7 +14,7 @@ return
         if is_empty_table then
           return '}'
         else
-          return '\n' .. self.indents_table.indents[deep // 2] .. '}'
+          return '\n' .. self.indents_table.indents[math.floor(deep / 2)] .. '}'
         end
       end,
     records_delimiter =
@@ -28,9 +28,9 @@ return
     key_indent =
       function(self, deep, is_first)
         if is_first then
-          return '\n' .. self.indents_table.indents[(deep + 1) // 2]
+          return '\n' .. self.indents_table.indents[math.floor((deep + 1) / 2)]
         else
-          return self.indents_table.indents[(deep + 1) // 2]
+          return self.indents_table.indents[math.floor((deep + 1) / 2)]
         end
       end,
     key_prefix = '[',

workshop/file/as_string.lua

@@ -3,7 +3,7 @@ local safe_open = request('safe_open')
 return
   function(file_name)
     local fIn = safe_open(file_name, 'rb')
-    local result = fIn:read('a')
+    local result = fIn:read('*a')
     fIn:close()
     return result
   end

workshop/file/get_unique_name.lua

@@ -5,7 +5,8 @@ local init =
       {
         __index =
           function(t, key)
-            if is_integer(key) then
+            if is_number(key) then
+              key = math.floor(key)
               local value = self.indent_chunk:rep(key)
               t[key] = value
               return value

workshop/handy_mechs/indents_table.lua

@@ -84,18 +84,19 @@ return
         local is_neg = (n < 0)
         n = math.abs(n)
 
-        ::redo::
-        local int_part, frac_part = math.modf(n)
-        -- print(self.type, int_part, frac_part, pos, n)
-        if units[pos - 1] and (int_part == 0) then
-          n = n * units[pos][1]
-          pos = pos - 1
-          goto redo
-        end
-        if units[pos + 1] and (int_part >= units[pos + 1][1]) then
-          pos = pos + 1
-          n = n / units[pos][1]
-          goto redo
+        local int_part, frac_part
+        while true do
+          int_part, frac_part = math.modf(n)
+          -- print(self.type, int_part, frac_part, pos, n)
+          if units[pos - 1] and (int_part == 0) then
+            n = n * units[pos][1]
+            pos = pos - 1
+          elseif units[pos + 1] and (int_part >= units[pos + 1][1]) then
+            pos = pos + 1
+            n = n / units[pos][1]
+          else
+            break
+          end
         end
 
         local unit_name = units[pos][2]

workshop/handy_mechs/number_representer.lua

@@ -0,0 +1,63 @@
+-- String concatter implementation as array with bounded upper size.
+
+--[[
+  After reaching some threshold all elements of array compressed to
+  one element and garbage collection is performed.
+]]
+
+return
+  {
+    comfort_array_size = 4e6,
+    maximum_array_size = 8e6,
+    estimated_compression_to_act = math.sqrt(2),
+    debug_output = false,
+    data = {},
+    table_rec_size = 52,
+    total_data_len = 0,
+    init =
+      function(self)
+        self.data = {}
+        self.total_data_len = 0
+      end,
+    compress =
+      function(self)
+        self.data = {table.concat(self.data)}
+        collectgarbage()
+      end,
+    add =
+      function(self, term)
+        self.data[#self.data + 1] = term
+        self.total_data_len = self.total_data_len + #term
+        if (#self.data > self.comfort_array_size) then
+          local data_size = #self.data * self.table_rec_size + self.total_data_len
+          local compressed_size = self.table_rec_size + self.total_data_len
+          if
+            (data_size / compressed_size > self.estimated_compression_to_act) or
+            (#self.data > self.maximum_array_size)
+          then
+            local mem_before = collectgarbage('count') / 1024
+            local num_els_before = #self.data
+            self:compress()
+            if self.debug_output then
+              local mem_current = collectgarbage('count') / 1024
+              print(
+                ('[#%.0fk, %.0fMB, %.0fMB, %.1f]: [%.0fMiB] -> [%.0fMiB][%.0fMiB]'):
+                format(
+                  num_els_before / 1e3,
+                  data_size / 1e6,
+                  compressed_size / 1e6,
+                  (data_size - compressed_size) / 1e6,
+                  mem_before,
+                  mem_current,
+                  mem_before - mem_current
+                )
+              )
+            end
+          end
+        end
+      end,
+    get_result =
+      function(self)
+        return table.concat(self.data)
+      end,
+  }

workshop/handy_mechs/string_adders/any.lua

@@ -2,12 +2,8 @@ return
   function(self, line_num)
     local line_len, text_len
     if self.lines[line_num] then
-      local indent_chunk_len = utf8.len(self.indent_chunk)
-      text_len =
-        (
-          utf8.len(self.lines[line_num]) or
-          string.len(self.lines[line_num])
-        )
+      local indent_chunk_len = #self.indent_chunk
+      text_len = #self.lines[line_num]
       line_len =
         text_len + indent_chunk_len * self.line_indents[line_num]
     end