refactoring

Author: CapsAdmin

nattlua/other/fs.lua

@@ -5,47 +5,16 @@ if not jit then
 
 elseif jit.arch ~= "Windows" then
 	local ffi = require("ffi")
-	ffi.cdef("char *strerror(int);")
 
-	function fs.last_error()
-		local num = ffi.errno()
-		local err = ffi.string(ffi.C.strerror(num))
-		return err == "" and tostring(num) or err
-	end
-else
-	local ffi = require("ffi")
-	ffi.cdef("uint32_t GetLastError();")
-	ffi.cdef[[
-		uint32_t FormatMessageA(
-			uint32_t dwFlags,
-			const void* lpSource,
-			uint32_t dwMessageId,
-			uint32_t dwLanguageId,
-			char* lpBuffer,
-			uint32_t nSize,
-			va_list *Arguments
-		);
-	]]
-	local error_str = ffi.new("uint8_t[?]", 1024)
-	local FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000
-	local FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200
-	local error_flags = bit.bor(FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_IGNORE_INSERTS)
-
-	function fs.last_error()
-		local code = ffi.C.GetLastError()
-		local numout = ffi.C.FormatMessageA(error_flags, nil, code, 0, error_str, 1023, nil)
-		local err = numout ~= 0 and ffi.string(error_str, numout)
-
-		if err and err:sub(-2) == "\r\n" then return err:sub(0, -3) end
-
-		return err
-	end
-end
-
-if not jit then
+	do
+		ffi.cdef("char *strerror(int);")
 
-elseif jit.arch ~= "Windows" then
-	local ffi = require("ffi")
+		function fs.last_error()
+			local num = ffi.errno()
+			local err = ffi.string(ffi.C.strerror(num))
+			return err == "" and tostring(num) or err
+		end
+	end
 
 	do -- attributes
 		local stat_struct
@@ -361,6 +330,37 @@ elseif jit.arch ~= "Windows" then
 	end
 else
 	local ffi = require("ffi")
+
+	do
+		local ffi = require("ffi")
+		ffi.cdef("uint32_t GetLastError();")
+		ffi.cdef[[
+			uint32_t FormatMessageA(
+				uint32_t dwFlags,
+				const void* lpSource,
+				uint32_t dwMessageId,
+				uint32_t dwLanguageId,
+				char* lpBuffer,
+				uint32_t nSize,
+				va_list *Arguments
+			);
+		]]
+		local error_str = ffi.new("uint8_t[?]", 1024)
+		local FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000
+		local FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200
+		local error_flags = bit.bor(FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_IGNORE_INSERTS)
+
+		function fs.last_error()
+			local code = ffi.C.GetLastError()
+			local numout = ffi.C.FormatMessageA(error_flags, nil, code, 0, error_str, 1023, nil)
+			local err = numout ~= 0 and ffi.string(error_str, numout)
+
+			if err and err:sub(-2) == "\r\n" then return err:sub(0, -3) end
+
+			return err
+		end
+	end
+
 	local DIRECTORY = 0x10
 	local time_struct = ffi.typeof([[
 		struct {

nattlua/other/integer.lua

@@ -0,0 +1,26 @@
+
+local strip_integer = (
+		not jit and
+		(
+			_VERSION == "Lua 5.1" or
+			_VERSION == "Lua 5.2" or
+			_VERSION == "Lua 5.3" or
+			_VERSION == "Lua 5.4"
+		)
+	)--[[# as boolean]]
+
+local function string_to_integer(str--[[#: string]])--[[#: number]]
+	if strip_integer then
+		str = str:lower():sub(-3)
+
+		if str == "ull" then
+			str = str:sub(1, -4)
+		elseif str:sub(-2) == "ll" then
+			str = str:sub(1, -3)
+		end
+	end
+
+	return assert(loadstring("return " .. str))()
+end
+
+return string_to_integer

nattlua/types/number.lua

@@ -9,6 +9,7 @@ local type = _G.type
 local error_messages = require("nattlua.error_messages")
 local bit = require("nattlua.other.bit")
 local loadstring = require("nattlua.other.loadstring")
+local string_to_integer = require("nattlua.other.integer")
 local jit = _G.jit
 local False = require("nattlua.types.symbol").False
 local META = require("nattlua.types.base")()
@@ -316,30 +317,6 @@ do
 	end
 end
 
-local strip_integer = (
-		not jit and
-		(
-			_VERSION == "Lua 5.1" or
-			_VERSION == "Lua 5.2" or
-			_VERSION == "Lua 5.3" or
-			_VERSION == "Lua 5.4"
-		)
-	)--[[# as boolean]]
-
-local function string_to_integer(str--[[#: string]])--[[#: number]]
-	if strip_integer then
-		str = str:lower():sub(-3)
-
-		if str == "ull" then
-			str = str:sub(1, -4)
-		elseif str:sub(-2) == "ll" then
-			str = str:sub(1, -3)
-		end
-	end
-
-	return assert(loadstring("return " .. str))()
-end
-
 function META:IsNumeric()
 	return true
 end