X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=expr.c;h=1747c8441666c4d79815b9b11dd20609d027dbf8;hp=6e0bd18b4360f92e587deef291dcb707bc1672e5;hb=daf2f61a3664329ae7f9609e1e14da2b8780fd10;hpb=d16b8ea0ee65b2ad901ca6b0624c07e6e4930cc4

diff --git a/expr.c b/expr.c
index 6e0bd18..1747c84 100644
--- a/expr.c
+++ b/expr.c
@@ -60,7 +60,7 @@ static VALUE str_value(char * p)
 {
 	VALUE v;
 
-	for(v=0; *p; ++p)
+	for(v=0; *p; p++)
 		v = (v << 8) | (*p & 0xFF);
 
 	return v;
@@ -76,7 +76,7 @@ void init_expr(void)
 	char * p;								// Token pointer
 
 	// Initialize token-class table
-	for(i=0; i<128; ++i)					// Mark all entries END
+	for(i=0; i<128; i++)					// Mark all entries END
 		tokcl[i] = END;
 
 	for(i=0, p=itokcl; *p!=1; p++)
@@ -162,16 +162,7 @@ int expr1(void)
 #else
 			p = string[*tok++];
 #endif
-
-#if 0
-			if (lookup(p, MACRO, 0) == NULL)
-				w = 0;
-			else
-				w = 1;
-#else
 			w = (lookup(p, MACRO, 0) == NULL ? 0 : 1);
-#endif
-
 			*tk++ = CONST;
 			*tk++ = (TOKEN)w;
 			break;
@@ -194,15 +185,7 @@ getsym:
 			if (*p == '.')
 				j = curenv;
 
-#if 0
-			if ((sy = lookup(p, LABEL, j)) != NULL && (sy->sattr & w))
-				w = 1;
-			else
-				w = 0;
-#else
 			w = ((sy = lookup(p, LABEL, j)) != NULL && (sy->sattr & w) ? 1 : 0);
-#endif
-
 			*tk++ = CONST;
 			*tk++ = (TOKEN)w;
 			break;