remove dead code

Author: CapsAdmin

nattlua.lua

@@ -1,6 +1,7 @@
 #!/usr/local/bin/luajit
 
 if ... == "test" then
+	require("test.helpers.preprocess")
 	STARTUP_PROFILE = true
 	require("test.helpers.profiler").Start()
 end

nattlua/other/formating.lua

@@ -7,7 +7,6 @@ local tostring = _G.tostring
 local error = _G.error
 local ipairs = _G.ipairs
 local stringx = require("nattlua.other.string")
-local mathx = require("nattlua.other.math")
 local formating = {}
 
 function formating.QuoteToken(str--[[#: string]])--[[#: string]]
@@ -284,6 +283,10 @@ local function calculate_text_positions(
 	}
 end
 
+local function clamp(num--[[#: number]], min--[[#: number]], max--[[#: number]])
+	return math.min(math.max(num, min), max)
+end
+
 function formating.BuildSourceCodePointMessage2(
 	code--[[#: string]],
 	start--[[#: number]],
@@ -303,8 +306,8 @@ function formating.BuildSourceCodePointMessage2(
 
 	if config.show_box == nil then config.show_box = true end
 
-	start = mathx.clamp(start or 1, 1, #code)
-	stop = mathx.clamp(stop or 1, 1, #code)
+	start = clamp(start or 1, 1, #code)
+	stop = clamp(stop or 1, 1, #code)
 
 	if stop < start then start, stop = stop, start end
 

nattlua/other/math.lua

@@ -166,8 +166,8 @@ function path.GetFileName(path, no_extension)
 
 		if last_dot then return path:sub(1, last_dot - 1) else return path end
 	end
-	return path
 
+	return path
 end
 
 return path

nattlua/other/path.lua

@@ -33,22 +33,6 @@ function stringx.replace(self--[[#: string]], old--[[#: string]], new--[[#: stri
 	return table.concat(parts, new)
 end
 
-function stringx.trim(self--[[#: string]])
-	local char = "%s*"
-	local _, start = self:find(char, 0)
-	local end_start, end_stop = self:reverse():find(char, 0)
-
-	if start and end_start and end_stop then
-		return self:sub(start + 1, (end_start - end_stop) - 2)
-	elseif start then
-		return self:sub(start + 1)
-	elseif end_start and end_stop then
-		return self:sub(0, (end_start - end_stop) - 2)
-	end
-
-	return self
-end
-
 function stringx.pad_left(str--[[#: string]], len--[[#: number]], char--[[#: string]])
 	if #str < len + 1 then return char:rep(len - #str + 1) .. str end
 

nattlua/other/string.lua

@@ -15,6 +15,7 @@ function coverage.Preprocess(code, key)
 			-- don't mark the funciton body as being called
 			start, stop = node.tokens["function"].start, node.tokens["function"].stop
 		end
+
 		if node.kind == "table" then
 			-- don't mark the funciton body as being called
 			start, stop = node.tokens["{"].start, node.tokens["{"].stop
@@ -136,33 +137,6 @@ function coverage.Clear(key)
 	_G.__COVERAGE[key] = nil
 end
 
-local function normalizeRanges(ranges)
-	local start, stop = ranges[1][1], ranges[#ranges][2]
-	local new_list = {}
-	local last = 0
-	local last_index = start
-	local i = start
-
-	while i <= stop do
-		local count = 0
-
-		for _, range in ipairs(ranges) do
-			if i >= range[1] and i <= range[2] then count = count + range[3] end
-		end
-
-		if count ~= last then
-			table.insert(new_list, {last_index, i, count})
-			i = i + 1
-			last = count
-			last_index = i
-		end
-
-		i = i + 1
-	end
-
-	return new_list
-end
-
 local function normalizeRanges(ranges)
 	local map = {}
 	local minVal = math.huge

test/helpers/coverage.lua

@@ -24,7 +24,7 @@ if is_coverage then
 
 	function preprocess.Preprocess(code, name, path, from)
 		if from == "package" then
-			if path and path:find("^nattlua/") and not path:find("^nattlua/other") then
+			if path and path:find("^nattlua/") then
 				covered[name] = path
 				return coverage.Preprocess(code, name)
 			end

test/run.lua

@@ -51,7 +51,6 @@ local function annotate_equal(code)
 	equal(annotate(code), code)
 end
 
-
 collect([[
 
     local foo = {
@@ -293,6 +292,11 @@ local code = META.New([[
 ]=])
 
 
+coverage.Preprocess([==[
+	--[[#local type x = tbl[name] ]]
+]==], "test")
+
+
 equal(annotate("local x = 1"), "1")
 equal(annotate("do return end"), "return")
 equal(