Browse code

(uxnasm) Renamed conflicting function

neauoire authored on 30/11/2021 00:19:47
Showing 1 changed files
... ...
@@ -63,7 +63,7 @@ static char *scat(char *dst, const char *src) { char *ptr = dst + slen(dst); whi
63 63
 
64 64
 /* clang-format on */
65 65
 
66
-static int tokenize(char *w, FILE *f);
66
+static int parse(char *w, FILE *f);
67 67
 
68 68
 static int
69 69
 error(const char *name, const char *msg)
... ...
@@ -227,14 +227,14 @@ doinclude(const char *filename)
227 227
 	if(!(f = fopen(filename, "r")))
228 228
 		return error("Include missing", filename);
229 229
 	while(fscanf(f, "%63s", w) == 1)
230
-		if(!tokenize(w, f))
230
+		if(!parse(w, f))
231 231
 			return error("Unknown token", w);
232 232
 	fclose(f);
233 233
 	return 1;
234 234
 }
235 235
 
236 236
 static int
237
-tokenize(char *w, FILE *f)
237
+parse(char *w, FILE *f)
238 238
 {
239 239
 	int i = 0;
240 240
 	char word[64], subw[64], c;
... ...
@@ -324,7 +324,7 @@ tokenize(char *w, FILE *f)
324 324
 		/* macro */
325 325
 		else if((m = findmacro(w))) {
326 326
 			for(i = 0; i < m->len; ++i)
327
-				if(!tokenize(m->items[i], f))
327
+				if(!parse(m->items[i], f))
328 328
 					return 0;
329 329
 			return 1;
330 330
 		} else
... ...
@@ -380,7 +380,7 @@ assemble(FILE *f)
380 380
 	char w[64];
381 381
 	scpy("on-reset", p.scope, 64);
382 382
 	while(fscanf(f, "%63s", w) == 1)
383
-		if(!tokenize(w, f))
383
+		if(!parse(w, f))
384 384
 			return error("Unknown token", w);
385 385
 	resolve();
386 386
 	return 1;