Merge pull request #349 from andrey-terekhov/feature

Feature

.gitignore

@@ -74,6 +74,7 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+cmake-build-default*/
 
 # VSCode
 .vscode/*
@@ -93,6 +94,9 @@ Release/
 *.perspectivev3
 *.xcodeproj
 
+# CLion
+*.idea
+
 # Windows
 desktop.ini
 

libs/compiler/syntax.c

@@ -220,7 +220,7 @@ static void ident_init(syntax *const sx)
 	builtin_add(sx, U"fputc", U"фписать_символ", type_function(sx, TYPE_INTEGER, "iP"));
 	builtin_add(sx, U"fclose", U"фзакрыть", type_function(sx, TYPE_INTEGER, "P"));
 	builtin_add(sx, U"exit", U"выход", type_function(sx, TYPE_VOID, "i"));
-	
+
 	builtin_add(sx, U"printf", U"печатьф", type_function(sx, TYPE_INTEGER, "s."));
 	builtin_add(sx, U"print", U"печать", type_function(sx, TYPE_VOID, "."));
 	builtin_add(sx, U"printid", U"печатьид", type_function(sx, TYPE_VOID, "."));
@@ -858,8 +858,9 @@ scope scope_block_enter(syntax *const sx)
 		return (scope){ ITEM_MAX, ITEM_MAX };
 	}
 
+	size_t prev_cur_id = sx->cur_id;
 	sx->cur_id = vector_size(&sx->identifiers);
-	return (scope){ sx->displ, sx->lg };
+	return (scope){ sx->displ, sx->lg, prev_cur_id };
 }
 
 int scope_block_exit(syntax *const sx, const scope scp)
@@ -877,6 +878,7 @@ int scope_block_exit(syntax *const sx, const scope scp)
 
 	sx->displ = scp.displ;
 	sx->lg = scp.lg;
+	sx->cur_id = scp.cur_id;
 	return 0;
 }
 

libs/compiler/syntax.h

@@ -93,6 +93,7 @@ typedef struct scope
 {
 	item_t displ;
 	item_t lg;
+	size_t cur_id;
 } scope;
 
 

tests/codegen/input/getid/math/gauss/no-llvm/temprorary/pronyushkin.c

@@ -5,9 +5,8 @@ void main()
 
 	getid(N);
 	printid(N);
+	float A[N][N], B[N], X[N];
 	{
-		float A[N][N], B[N], X[N];
-
 		getid(A); 
 		printid(A);
 

tests/semantics/use_of_undeclared_identifier/use_begind_the_scope.c

@@ -0,0 +1,15 @@
+// Use of undeclared identifier.
+// More scopes.
+
+void main()
+{
+	int N = 10, i, j, k;
+	{
+		float A[N][N], B[N], X[N];
+		{
+			float t, S;
+		}
+	}
+
+	print (X);
+}