fix callbacks with less arguments than their contract erroring

Author: CapsAdmin

nattlua/analyzer/operators/call.lua

@@ -137,6 +137,8 @@ do
 		obj:SetCalled(true)
 
 		-- infer any uncalled functions in the arguments to get their return type
+		if not input then debug.trace() end
+
 		for i, b in ipairs(input:GetData()) do
 			if b.Type == "function" and not b:IsCalled() and not b:IsExplicitOutputSignature() then
 				local a = obj:GetInputSignature():GetWithNumber(i)
@@ -162,7 +164,19 @@ do
 						-- TODO: callbacks with ref arguments should not be called
 						-- mixed ref args make no sense, maybe ref should be a keyword for the function instead?
 						if func.Type == "function" and not b:HasReferenceTypes() and func then
-							self:Assert(self:Call(b, func:GetInputSignature():Copy(nil, true)))
+							local len = b:GetInputSignature():GetTupleLength()
+							local new = func:GetInputSignature():Copy(nil, true)
+							local err
+
+							if not func:GetInputSignature():IsInfinite() then
+								new, err = new:Slice(1, len)
+							end
+
+							if not new then
+								self:Assert(new, err)
+							else
+								self:Assert(self:Call(b, new))
+							end
 						end
 					end
 				end

nattlua/analyzer/operators/function_call_body.lua

@@ -241,7 +241,19 @@ local function check_input(self, obj, input)
 
 								func:SetInputSignature(tup)
 							elseif contract.Type == "function" then
-								func:SetInputSignature(contract:GetInputSignature():Copy(nil, true)) -- force copy tables so we don't mutate the contract
+								local len = func:GetInputSignature():GetTupleLength()
+								local new = contract:GetInputSignature():Copy(nil, true)
+								local err
+
+								if not contract:GetInputSignature():IsInfinite() then
+									new, err = new:Slice(1, len)
+								end
+
+								if not new then
+									self:Assert(new, err)
+								else
+									func:SetInputSignature(new) -- force copy tables so we don't mutate the contract
+								end
 							end
 
 							func:SetCalled(false)
@@ -552,7 +564,13 @@ return function(self, obj, input)
 			end
 		end
 
-		obj:GetInputSignature():Merge(self:Assert(input:Slice(1, obj:GetInputSignature():GetMinimumLength())))
+		local tup, err = input:Slice(1, obj:GetInputSignature():GetMinimumLength())
+
+		if not tup then
+			self:Assert(tup, err)
+		else
+			obj:GetInputSignature():Merge(tup)
+		end
 	end
 
 	do -- this is for the emitter

nattlua/types/tuple.lua

@@ -38,6 +38,10 @@ function META.Equal(a--[[#: TTuple]], b--[[#: TBaseType]], visited--[[#: Map<|TB
 		if not ok then break end
 	end
 
+	if not ok then
+		reason = reason or "unknown reason"
+	end
+
 	return ok, reason
 end
 

test/tests/nattlua/analyzer/type_functions.lua

@@ -716,3 +716,16 @@ attest.equal(x, 42 as number | false)
 attest.equal(y, "error" as string | nil)
 
 ]]
+
+analyze[[
+local luadata = {}
+luadata.Types = {}
+
+function luadata.SetModifier(type: string, callback: function=(string, number)>(string))
+	luadata.Types[type] = callback
+end
+luadata.SetModifier("test", function(x)
+	attest.equal(x, _ as string)
+	return tostring(x)
+end)
+]]