Skip to contentSkip to conversation

kill NS_INVISIBLEMACRO, introduce NS_UNDEF

PATCH Applied Oleg Nesterov 1 participant 1 message Jan 2, 2006 Sparse checker

lore
Share & tools
lore
#0 lore raw

PATCH 2/7 kill NS_INVISIBLEMACRO, introduce NS_UNDEF

With this patch handle_undef() doesn't corrupt the builtin macros.

This (imho) cleanups the code and is used in the next patches.

symbol.h renamed from symbol.h~2_UNDEF +1 -1
@@ -32,7 +32,7 @@ enum namespace {
 	NS_SYMBOL = 16,
 	NS_ITERATOR = 32,
 	NS_PREPROCESSOR = 64,
-	NS_INVISIBLEMACRO = 128,
+	NS_UNDEF = 128,
 };
 
 enum type {
scope.c renamed from scope.c~2_UNDEF +0 -7
@@ -41,7 +41,6 @@ static void start_scope(struct scope **s
 void start_file_scope(void)
 {
 	struct scope *scope = __alloc_scope(0);
-	struct symbol *sym;
 
 	memset(scope, 0, sizeof(*scope));
 	scope->next = &builtin_scope;
@@ -50,12 +49,6 @@ void start_file_scope(void)
 	/* top-level stuff defaults to file scopt, "extern" etc will choose global scope */
 	function_scope = scope;
 	block_scope = scope;
-
-	/* Make the builtin macros visible again */
-	FOR_EACH_PTR(builtin_scope.symbols, sym) {
-		if (sym->namespace == NS_INVISIBLEMACRO)
-			sym->namespace = NS_MACRO;
-	} END_FOR_EACH_PTR(sym);
 }
 
 void start_symbol_scope(void)
pre-process.c renamed from pre-process.c~2_UNDEF +10 -3
@@ -103,7 +103,7 @@ static void replace_with_integer(struct 
 
 static struct symbol *lookup_macro(struct ident *ident)
 {
-	struct symbol *sym = lookup_symbol(ident, NS_MACRO | NS_INVISIBLEMACRO);
+	struct symbol *sym = lookup_symbol(ident, NS_MACRO | NS_UNDEF);
 	if (sym && sym->namespace != NS_MACRO)
 		sym = NULL;
 	return sym;
@@ -1134,8 +1134,15 @@ static int handle_undef(struct stream *s
 	}
 
 	sym = lookup_macro(left->ident);
-	if (sym)
-		sym->namespace = NS_INVISIBLEMACRO;
+	if (!sym)
+		return 1;
+
+	if (sym->scope != file_scope) {
+		sym = alloc_symbol(left->pos, SYM_NODE);
+		bind_symbol(sym, left->ident, NS_MACRO);
+	}
+
+	sym->namespace = NS_UNDEF;
 
 	return 1;
 }