Cleanup

Minor code cleanup

src/other/b.b

@@ -79,7 +79,6 @@ symbol() {
   } else {
     if (eof)
       return(0);
-  else
     c = read();
   }
 loop:
@@ -97,18 +96,18 @@ loop:
     goto loop;
   }
 
-  if (c=='=') {
+  if (c=='=')
     return(subseq('=',80,60));
-  }
-  if (c=='<') {
+
+  if (c=='<')
     return(subseq('=',63,62));
-  }
-  if (c=='>') {
+
+  if (c=='>')
     return(subseq('=',65,64));
-  }
-  if (c=='!') {
+
+  if (c=='!')
     return(subseq('=',34,61));
-  }
+
   if (c=='$') {
     if (subseq('(',0,1))
       return(2);
@@ -155,9 +154,12 @@ com1:
   }
   if (ct==123) { /* letter */
     sp = symbuf;
-    while(ctab[c]==123 | ctab[c]==124) {
-      if (sp<symbuf+9) { *sp = c; sp = sp+1; }
-      c = read();
+    while(ct==123 | ct==124) {
+      if (sp<symbuf+9) {
+        *sp = c;
+        sp = sp+1;
+      }
+      ct = ctab[c = read()];
     }
     *sp = 0;
     peekc = c;
@@ -192,11 +194,13 @@ getcc() {
   auto c;
 
   cval = 0;
-  if ((c = mapch('*'')) < 0) return;
+  if ((c = mapch('*'')) < 0)
+    return;
   cval = c;
-  if ((c = mapch('*'')) < 0) return;
+  if ((c = mapch('*'')) < 0)
+    return;
   cval = cval * 512 + c;
-  if ((c = mapch('*'')) >= 0)
+  if (mapch('*'') >= 0)
     error('cc');
 }
 
@@ -394,13 +398,10 @@ loop:
   peeksym = o;
 }
 
-pexpr()
-{
-  auto o, t;
-
-  if ((o=symbol())==6) { /* ( */
+pexpr() {
+  if (symbol()==6) { /* ( */
     expr(15);
-    if ((o=symbol())==7) /* ) */
+    if (symbol()==7) /* ) */
       return;
   }
   error('()');
@@ -556,8 +557,7 @@ stmt() {
 next:
   o = symbol();
 
-  if (o==0) /* eof */
-  {
+  if (o==0) { /* eof */
     error('fe'); /* Unexpected eof */
     return;
   }
@@ -716,8 +716,7 @@ name(s) {
   }
 }
 
-error(code)
-{
+error(code) {
   extrn line, eof, csym, nerror, fout;
   auto f;
 

tools/b.c

@@ -126,7 +126,6 @@ symbol() {
   } else {
     if (eof)
       return(0);
-  else
     c = read();
   }
 loop:
@@ -144,18 +143,18 @@ loop:
     goto loop;
   }
 
-  if (c=='=') {
+  if (c=='=')
     return(subseq('=',80,60));
-  }
-  if (c=='<') {
+
+  if (c=='<')
     return(subseq('=',63,62));
-  }
-  if (c=='>') {
+
+  if (c=='>')
     return(subseq('=',65,64));
-  }
-  if (c=='!') {
+
+  if (c=='!')
     return(subseq('=',34,61));
-  }
+
   if (c=='$') {
     if (subseq('(',0,1))
       return(2);
@@ -202,9 +201,12 @@ com1:
   }
   if (ct==123) { /* letter */
     sp = symbuf;
-    while(ctab[c]==123 | ctab[c]==124) {
-      if (sp<symbuf+9) { *sp = c; sp = sp+1; }
-      c = read();
+    while(ct==123 | ct==124) {
+      if (sp<symbuf+9) {
+        *sp = c;
+        sp = sp+1;
+      }
+      ct = ctab[c = read()];
     }
     *sp = 0;
     peekc = c;
@@ -239,11 +241,13 @@ getcc() {
   auto c;
 
   cval = 0;
-  if ((c = mapch('\'')) < 0) return;
+  if ((c = mapch('\'')) < 0)
+    return;
   cval = c;
-  if ((c = mapch('\'')) < 0) return;
+  if ((c = mapch('\'')) < 0)
+    return;
   cval = cval * 512 + c;
-  if ((c = mapch('\'')) >= 0)
+  if (mapch('\'') >= 0)
     error('cc');
 }
 
@@ -441,13 +445,10 @@ loop:
   peeksym = o;
 }
 
-pexpr()
-{
-  auto o, t;
-
-  if ((o=symbol())==6) { /* ( */
+pexpr() {
+  if (symbol()==6) { /* ( */
     expr(15);
-    if ((o=symbol())==7) /* ) */
+    if (symbol()==7) /* ) */
       return;
   }
   error('()');
@@ -603,8 +604,7 @@ stmt() {
 next:
   o = symbol();
 
-  if (o==0) /* eof */
-  {
+  if (o==0) { /* eof */
     error('fe'); /* Unexpected eof */
     return;
   }
@@ -763,8 +763,7 @@ name(int *s) {
   }
 }
 
-error(code)
-{
+error(code) {
   extern line, eof, *csym, nerror, fout;
   auto f;