changeset 169:80e243f2047d

Revert addition of "isspecial" field in struct macro. It doesn't do anything useful any more.
author David A. Holland
date Fri, 12 Jun 2015 02:01:00 -0400
parents 8d8a4bfd4684
children 2ee7db420643
files macro.c
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/macro.c	Fri Jun 12 01:55:52 2015 -0400
+++ b/macro.c	Fri Jun 12 02:01:00 2015 -0400
@@ -56,7 +56,6 @@
 	char *name;
 	unsigned hash;
 	bool hasparams;
-	bool isspecial;
 	bool inuse;
 };
 DECLARRAY(macro, static UNUSED);
@@ -172,7 +171,6 @@
 	m->hash = hash;
 	m->name = dostrdup(name);
 	m->hasparams = false;
-	m->isspecial = false;
 	stringarray_init(&m->params);
 	expansionitemarray_init(&m->expansion);
 	m->inuse = false;
@@ -199,10 +197,6 @@
 	struct expansionitem *ei1, *ei2;
 	const char *p1, *p2;
 
-	if (m2->isspecial) {
-		return false;
-	}
-
 	if (strcmp(m1->name, m2->name) != 0) {
 		return false;
 	}
@@ -608,7 +602,6 @@
 	struct expansionitem *ei;
 
 	m = macro_define_common_start(p, "__FILE__", p);
-	m->isspecial = true;
 	ei = expansionitem_create_file();
 	expansionitemarray_add(&m->expansion, ei, NULL);
 	macro_define_common_end(m);
@@ -621,7 +614,6 @@
 	struct expansionitem *ei;
 
 	m = macro_define_common_start(p, "__LINE__", p);
-	m->isspecial = true;
 	ei = expansionitem_create_line();
 	expansionitemarray_add(&m->expansion, ei, NULL);
 	macro_define_common_end(m);