summary refs log tree commit diff
path: root/lisc/parse.c
diff options
context:
space:
mode:
authorQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-08-02 20:16:18 -0400
committerQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-09-15 23:01:29 -0400
commit53e6393295871b4682bf54374bc76cb0c35c42a6 (patch)
treeca09db24854e8cddb5dde4ef2f8e92c686a2d090 /lisc/parse.c
parent8d2d674466c14738418fb6579126569f53d6f86a (diff)
downloadroux-53e6393295871b4682bf54374bc76cb0c35c42a6.tar.gz
avoid name conflicts in enums
Diffstat (limited to 'lisc/parse.c')
-rw-r--r--lisc/parse.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisc/parse.c b/lisc/parse.c
index 6335aa4..e1a1174 100644
--- a/lisc/parse.c
+++ b/lisc/parse.c
@@ -404,10 +404,10 @@ parseline(PState ps)
 	expect(TEq);
 	switch (next()) {
 	case TW:
-		sym[r.val].class = CWord;
+		sym[r.val].type = SWord;
 		break;
 	case TL:
-		sym[r.val].class = CLong;
+		sym[r.val].type = SLong;
 		break;
 	default:
 		err("class expected after =");
@@ -521,16 +521,16 @@ parsefn(FILE *f)
 static char *
 printref(Ref r, Fn *fn, FILE *f)
 {
-	static char *ctoa[] = {
-		[CXXX] = "?",
-		[CWord] = "w",
-		[CLong] = "l",
+	static char *ttoa[] = {
+		[SUndef] = "?",
+		[SWord] = "w",
+		[SLong] = "l",
 	};
 
 	switch (r.type) {
 	case RSym:
 		fprintf(f, "%%%s", fn->sym[r.val].name);
-		return ctoa[fn->sym[r.val].class];
+		return ttoa[fn->sym[r.val].type];
 	case RCons:
 		switch (fn->cons[r.val].type) {
 		case CAddr: