Make macros have file scope

Also, macros are special: they can be removed out of scope with #undef,
which makes them slightly more interesting when we exit the scope.

1 files changed, 11 insertions, 1 deletions

diff --git a/scope.c b/scope.c
index 9239bca..5305d03 100644
--- a/scope.c
+++ b/scope.c
@@ -10,6 +10,7 @@
  */
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "lib.h"
 #include "allocate.h"
@@ -64,8 +65,12 @@ static void remove_symbol_scope(struct symbol *sym)
 {
 	struct symbol **ptr = sym->id_list;
 
-	while (*ptr != sym)
+	while (*ptr != sym) {
+		/* Macros can get removed from scope early with #undef! */
+		if (!*ptr)
+			return;
 		ptr = &(*ptr)->next_id;
+	}
 	*ptr = sym->next_id;
 }
 
@@ -82,6 +87,11 @@ static void end_scope(struct scope **s)
 	} END_FOR_EACH_PTR(sym);
 }
 
+void end_file_scope(void)
+{
+	end_scope(&file_scope);
+}
+
 void end_symbol_scope(void)
 {
 	end_scope(&block_scope);