more work on bootstrapping

wip table typing

Author: CapsAdmin

nattlua/analyzer/base/base_analyzer.lua

@@ -131,9 +131,9 @@ return function(META--[[#: any]])
 				end
 
 				return new_tup
-			elseif tbl.PotentialSelf then
+			elseif tbl.potential_self then
 				local meta = tbl
-				local self = tbl.PotentialSelf
+				local self = tbl.potential_self
 
 				if self.Type == "union" then
 					for _, obj in ipairs(self:GetData()) do

nattlua/analyzer/operators/call.lua

@@ -271,7 +271,7 @@ local function any_call(self, analyzer, input, call_node)
 			if arg:GetContract() then
 				-- error if we call any with tables that have contracts
 				-- since anything might happen to them in an any call
-				analyzer:Error(error_messages.argument_contract_mutation(arg:GetContract()))
+				analyzer:Warning(error_messages.argument_contract_mutation(arg, arg:GetContract()))
 			else
 				-- if we pass a table without a contract to an any call, we add any to its key values
 				for _, keyval in ipairs(arg:GetData()) do

nattlua/analyzer/operators/function_call_body.lua

@@ -331,7 +331,7 @@ return function(self, obj, input)
 				if contract.Type == "union" then
 					local t = contract:GetType("table")
 
-					if t and t.PotentialSelf then doit = false end
+					if t and t.potential_self then doit = false end
 				end
 
 				if doit then

nattlua/base_environment.lua

@@ -38,11 +38,13 @@ end
 local function load_definitions(root_node, parent_config)
 	local path = "nattlua/definitions/index.nlua"
 	local config = {}
+
 	if parent_config then
 		for k, v in pairs(parent_config) do
 			config[k] = v
 		end
 	end
+
 	config.file_path = config.file_path or path
 	config.file_name = config.file_name or "@" .. path
 	config.root_directory = ROOT_PATH
@@ -79,24 +81,25 @@ return {
 		local typesystem_env = Table()
 		typesystem_env.string_metatable = Table()
 		compiler:SetEnvironments(runtime_env, typesystem_env)
-		
 		-- Use parent analyzer's config if it exists or just use a fresh analyzer
 		local analyzer
+
 		if parent_analyzer then
 			analyzer = require("nattlua.analyzer.analyzer").New(parent_analyzer.config)
-			-- Ensure we're using a common statement count if we want to track it
-			-- but for base environment it might be noisy. Let's at least record parsed paths.
+		-- Ensure we're using a common statement count if we want to track it
+		-- but for base environment it might be noisy. Let's at least record parsed paths.
 		end
-		
+
 		assert(compiler:Analyze(analyzer))
-		
+
 		if parent_analyzer then
 			for path, _ in pairs(compiler.analyzer.parsed_paths) do
 				parent_analyzer.parsed_paths[path] = true
 			end
+
 			parent_analyzer.statement_count = (parent_analyzer.statement_count or 0) + (compiler.analyzer.statement_count or 0)
 		end
-		
+
 		typesystem_env.string_metatable:Set(
 			LStringNoMeta("__index"),
 			assert(typesystem_env:Get(LStringNoMeta("string")), "failed to find string table")

nattlua/definitions/lua/ffi/main.lua

@@ -296,8 +296,8 @@ function cparser.metatype(ctype, meta)
 				local val = analyzer:Assert(analyzer:Call(new, Tuple({ctype, ...}))):GetFirstValue()
 
 				if analyzer:IsRuntime() then
-					meta.PotentialSelf = meta.PotentialSelf or Union()
-					meta.PotentialSelf:AddType(val)
+					meta.potential_self = meta.potential_self or Union()
+					meta.potential_self:AddType(val)
 				end
 
 				return val

nattlua/definitions/lua/globals.nlua

@@ -508,8 +508,8 @@ analyzer function setmetatable(tbl: Table, meta: Table | nil)
 			-- clear mutations so that when looking up values in the table they won't return their initial value
 			tbl:ClearMutations()
 		elseif analyzer:IsRuntime() then
-			meta.PotentialSelf = meta.PotentialSelf or types.Union()
-			meta.PotentialSelf:AddType(tbl)
+			meta.potential_self = meta.potential_self or types.Union()
+			meta.potential_self:AddType(tbl)
 		end
 
 		tbl:SetMetaTable(meta)

nattlua/definitions/utility.nlua

@@ -156,7 +156,7 @@ analyzer function copy(obj: any)
 
 	if copy.Type == "table" then
 		copy:SetCreationScope(false)
-		copy.PotentialSelf = false
+		copy.potential_self = false
 	end
 
 	return copy

nattlua/error_messages.lua

@@ -290,9 +290,11 @@ function error_messages.argument_mutation(i--[[#: number]], arg--[[#: any]])--[[
 	}
 end
 
-function error_messages.argument_contract_mutation(obj--[[#: any]])--[[#: Reason]]
+function error_messages.argument_contract_mutation(obj--[[#: any]], obj--[[#: any]])--[[#: Reason]]
 	return {
-		"cannot mutate argument with contract ",
+		"cannot mutate argument ",
+		obj,
+		" with contract ",
 		obj,
 	}
 end