fix infinite recursion in some cases

Author: CapsAdmin

nattlua/analyzer/expressions/import.lua

@@ -14,6 +14,8 @@ return {
 
 			if self.loaded_modules[cache] then return self.loaded_modules[cache] end
 
+			self.loaded_modules[cache] = Nil()
+
 			if root then
 				self.loaded_modules[cache] = self:AnalyzeRootStatement(root)
 			elseif node.data then

nattlua/analyzer/expressions/postfix_call.lua

@@ -95,7 +95,7 @@ return {
 			node.left.value.sub_type ~= "dofile" and
 			node.left.value.sub_type ~= "loadfile"
 		then
-			return AnalyzeImport(self, node, node.left.value.sub_type == "require" and node.path)
+			return AnalyzeImport(self, node, node.path)
 		end
 
 		self:PushAnalyzerEnvironment(node.type_call and "typesystem" or "runtime")

test/tests/nattlua/analyzer/file_importing/recursive/a.nlua

@@ -0,0 +1,2 @@
+_G.a_counter = (_G.a_counter or 0) + 1
+import("./test/tests/nattlua/analyzer/file_importing/recursive/b.nlua")

test/tests/nattlua/analyzer/file_importing/recursive/b.nlua

@@ -0,0 +1,2 @@
+_G.b_counter = (_G.b_counter or 0) + 1
+import("./test/tests/nattlua/analyzer/file_importing/recursive/a.nlua")

test/tests/nattlua/analyzer/file_importing/recursive/repro.lua

@@ -0,0 +1,3 @@
+analyze([[
+    import("test/tests/nattlua/analyzer/file_importing/recursive/a.nlua")
+]])

test/tests/nattlua/analyzer/recursive_import.lua

@@ -0,0 +1,5 @@
+test("recursive import crash repro", function()
+    analyze([[
+        import("test/tests/nattlua/analyzer/file_importing/recursive/a.nlua")
+    ]])
+end)