improve tuple slice which catches more errors

Author: CapsAdmin

examples/techniques/data_structures.lua

@@ -202,7 +202,7 @@ do
 	view_slice:Set(1, 666)
 	assert(view_slice:Get(1) == 666)
 	assert(arr:Get(6) == 666)
-	local slice = arr:Slice(5, 7)
+	local slice = assert(arr:Slice(5, 7))
 	assert(slice:Get(0) == 1)
 	assert(slice:Get(1) == 666)
 	assert(slice:Get(2) == 3)

nattlua/analyzer/operators/function_call_body.lua

@@ -472,7 +472,7 @@ return function(self, obj, input)
 
 		if self:IsRuntime() then
 			if identifier.value.value == "..." then
-				self:CreateLocalValue(identifier.value.value, input:Slice(argi))
+				self:CreateLocalValue(identifier.value.value, self:Assert(input:Slice(argi)))
 			else
 				local val, err = input:GetWithNumber(argi)
 
@@ -552,7 +552,7 @@ return function(self, obj, input)
 			end
 		end
 
-		obj:GetInputSignature():Merge(input:Slice(1, obj:GetInputSignature():GetMinimumLength()))
+		obj:GetInputSignature():Merge(self:Assert(input:Slice(1, obj:GetInputSignature():GetMinimumLength())))
 	end
 
 	do -- this is for the emitter

nattlua/definitions/lua/globals.nlua

@@ -376,7 +376,6 @@ type xpcall = ReturnIfNonLiteral<|
 type select = ReturnIfNonLiteral<|
 	analyzer function(index: 1 .. inf | "#", ...: ...any): ...any
 		local x = ...
-
 		if x and x.Type == "tuple" then
 			return select(index:GetData(), x:Unpack())
 		end
@@ -385,6 +384,15 @@ type select = ReturnIfNonLiteral<|
 	end
 |>
 
+type select_type = analyzer function(index: 1 .. inf | "#", ...: ...any): ...any
+	local x = ...
+	if x and x.Type == "tuple" then
+		return x:Slice(index:GetData())
+	end
+
+	return select(index:GetData(), ...)
+end
+
 analyzer function type(obj: any)
 	if obj.Type == "any" then return types.String() end
 

nattlua/definitions/utility.nlua

@@ -50,7 +50,7 @@ end
 
 analyzer function return_type(func: Function, i: number | nil)
 	local i = i and i:GetData() or nil
-	return {func:GetOutputSignature():Slice(i, i)}
+	return {analyzer:Assert(func:GetOutputSignature():Slice(i, i))}
 end
 
 analyzer function set_return_type(func: Function, tup: any)
@@ -61,7 +61,7 @@ end
 
 analyzer function argument_type(func: Function, i: number | nil)
 	local i = i and i:GetData() or nil
-	return {func:GetInputSignature():Slice(i, i)}
+	return {analyzer:Assert(func:GetInputSignature():Slice(i, i))}
 end
 
 analyzer function exclude(T: any, U: any)

nattlua/lexer/lexer.lua

@@ -647,7 +647,7 @@ do
 	META.ReadSingleQuoteString = build_string_reader("single", "'")
 end
 
-local ReadSymbolFromTrie = BuildTrieReader(runtime_syntax:GetSymbols())
+local ReadSymbolFromTrie = BuildTrieReader(runtime_syntax:GetSymbols(), false)
 
 function META:ReadSymbol()
 	if ReadSymbolFromTrie(self) then return "symbol" end

nattlua/parser/base.lua

@@ -109,7 +109,7 @@ do
 		self:PushContextValue("parent_node", node)
 	end
 
-	function META:GetParentNode(level)
+	function META:GetParentNode(level--[[#: nil | number]])
 		return self:GetContextValue("parent_node", level) or false--[[# as Node | false]]
 	end
 

nattlua/types/tuple.lua

@@ -564,10 +564,19 @@ function META:Slice(start--[[#: number]], stop--[[#: number]])
 	local data = {}
 
 	for i = start, stop do
-		table.insert(data, (self:GetData()--[[# as TBaseType]])[i])
+		local val, err = self:GetWithNumber(i)
+
+		if not val then return val, err end
+
+		table.insert(data, val)
 	end
 
-	return self:Copy():SetData(data)
+	local copy = META.New(data)
+	copy.Repeat = self.Repeat
+	copy.Remainder = self.Remainder and self.Remainder:Copy() or false
+	copy.Unpackable = self.Unpackable
+	copy:CopyInternalsFrom(self)
+	return copy
 end
 
 function META:GetFirstValue()

test/tests/editor_helper.lua

@@ -124,7 +124,7 @@ do
 	local code, line_pos, char_pos = get_line_char(code)
 	local editor = single_file(code)
 	local new_code = apply_edits(code, editor:GetRenameInstructions(path, line_pos, char_pos, "LOL"))
-	assert(code:gsub("foo", "LOL") == new_code)
+	equal(code:gsub("foo", "LOL"), new_code)
 end
 
 do
@@ -252,4 +252,5 @@ do
 	local integers = helper:GetSemanticTokens(path)
 	assert((#integers / 5) == 2)
 end
-_G.TEST = false
+
+_G.TEST = false

test/tests/nattlua/analyzer/file_importing/complex/first_file.lua

@@ -1,3 +1,3 @@
-local foo = require("test.tests.nattlua.analyzer.file_importing.complex.foo")()
+local foo = require("test.tests.nattlua.analyzer.file_importing.complex.foo")(1)
 local bar = require("test.tests.nattlua.analyzer.file_importing.complex.bar")
 return foo.get() + bar

test/tests/nattlua/analyzer/load.lua

@@ -6,7 +6,7 @@ analyze[[
         attest.equal(assert(load("return " .. 2))(), 2)
     ]]
 analyze[[
-    attest.equal(require("test.tests.nattlua.analyzer.file_importing.expect_5")(5), 1337)
+    attest.equal(require("test.tests.nattlua.analyzer.file_importing.expect_5")(5, nil, nil, nil), 1337)
 ]]
 -- file import
 equal(
@@ -24,7 +24,7 @@ equal(
 	end)
 ]=]
 analyze([[
-    attest.equal(loadfile("test/tests/nattlua/analyzer/file_importing/complex/main.nlua")(), 14)
+    attest.equal(loadfile("test/tests/nattlua/analyzer/file_importing/complex/main.nlua")(1), 14)
 ]])
 analyze[[
     attest.equal(require("test.tests.nattlua.analyzer.file_importing.complex.adapter"), 14)