Miscellaneous fixes to the word matcher.

[libucw.git] / lib / fastbuf.h

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 8195250e78e54c699d1c41079188c200dfb28a29..ba9c42c51322519ac28ee106adba71eae718c8df 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -37,6 +37,12 @@ extern inline int bgetc(struct fastbuf *f)
   return (f->bptr < f->bstop) ? (int) *f->bptr++ : bgetc_slow(f);
 }
 
+int bpeekc_slow(struct fastbuf *f);
+extern inline int bpeekc(struct fastbuf *f)
+{
+  return (f->bptr < f->bstop) ? (int) *f->bptr : bpeekc_slow(f);
+}
+
 extern inline void bungetc(struct fastbuf *f, byte c)
 {
   *--f->bptr = c;
@@ -54,99 +60,97 @@ extern inline void bputc(struct fastbuf *f, byte c)
 word bgetw_slow(struct fastbuf *f);
 extern inline word bgetw(struct fastbuf *f)
 {
-#ifdef CPU_CAN_DO_UNALIGNED_WORDS
   word w;
   if (f->bptr + 2 <= f->bstop)
     {
-      w = * ((word *) f->bptr);
-      f->bptr += 2;
-      return w;
-    }
-  else
-    return bgetw_slow(f);
+      byte *p = f->bptr;
+#ifdef CPU_CAN_DO_UNALIGNED_WORDS
+      w = * ((word *) p);
 #else
-  word w = bgetc(f);
 #ifdef CPU_BIG_ENDIAN
-  return (w << 8) | bgetc(f);
+      w = (p[0] << 8) | p[1];
 #else
-  return w | (bgetc(f) << 8);
+      w = (p[1] << 8) | p[0];
 #endif
 #endif
+      f->bptr += 2;
+      return w;
+    }
+  else
+    return bgetw_slow(f);
 }
 
 ulg bgetl_slow(struct fastbuf *f);
 extern inline ulg bgetl(struct fastbuf *f)
 {
-#ifdef CPU_CAN_DO_UNALIGNED_LONGS
   ulg l;
   if (f->bptr + 4 <= f->bstop)
     {
-      l = * ((ulg *) f->bptr);
-      f->bptr += 4;
-      return l;
-    }
-  else
-    return bgetl_slow(f);
+      byte *p = f->bptr;
+#ifdef CPU_CAN_DO_UNALIGNED_LONGS
+      l = * ((ulg *) p);
 #else
-  ulg l = bgetc(f);
 #ifdef CPU_BIG_ENDIAN
-  l = (l << 8) | bgetc(f);
-  l = (l << 8) | bgetc(f);
-  return (l << 8) | bgetc(f);
+      l = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
 #else
-  l = (bgetc(f) << 8) | l;
-  l = (bgetc(f) << 16) | l;
-  return (bgetc(f) << 24) | l;
+      l = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
 #endif
 #endif
+      f->bptr += 4;
+      return l;
+    }
+  else
+    return bgetl_slow(f);
 }
 
 void bputw_slow(struct fastbuf *f, word w);
 extern inline void bputw(struct fastbuf *f, word w)
 {
-#ifdef CPU_CAN_DO_UNALIGNED_WORDS
   if (f->bptr + 2 <= f->bufend)
     {
-      * ((word *) f->bptr) = w;
-      f->bptr += 2;
-    }
-  else
-    bputw_slow(f, w);
+      byte *p = f->bptr;
+#ifdef CPU_CAN_DO_UNALIGNED_WORDS
+      * ((word *) p) = w;
 #else
 #ifdef CPU_BIG_ENDIAN
-  bputc(f, w >> 8);
-  bputc(f, w);
+      p[0] = w >> 8U;
+      p[1] = w;
 #else
-  bputc(f, w);
-  bputc(f, w >> 8);
+      p[1] = w >> 8U;
+      p[0] = w;
 #endif
 #endif
+      f->bptr += 2;
+    }
+  else
+    bputw_slow(f, w);
 }
 
 void bputl_slow(struct fastbuf *f, ulg l);
 extern inline void bputl(struct fastbuf *f, ulg l)
 {
-#ifdef CPU_CAN_DO_UNALIGNED_LONGS
   if (f->bptr + 4 <= f->bufend)
     {
-      * ((ulg *) f->bptr) = l;
-      f->bptr += 4;
-    }
-  else
-    bputl_slow(f, l);
+      byte *p = f->bptr;
+#ifdef CPU_CAN_DO_UNALIGNED_LONGS
+      * ((ulg *) p) = l;
 #else
 #ifdef CPU_BIG_ENDIAN
-  bputc(f, l >> 24);
-  bputc(f, l >> 16);
-  bputc(f, l >> 8);
-  bputc(f, l);
+      p[0] = l >> 24U;
+      p[1] = l >> 16U;
+      p[2] = l >> 8U;
+      p[3] = l;
 #else
-  bputc(f, l);
-  bputc(f, l >> 8);
-  bputc(f, l >> 16);
-  bputc(f, l >> 24);
+      p[3] = l >> 24U;
+      p[2] = l >> 16U;
+      p[1] = l >> 8U;
+      p[0] = l;
 #endif
 #endif
+      f->bptr += 4;
+    }
+  else
+    bputl_slow(f, l);
 }
 
 void bread_slow(struct fastbuf *f, void *b, uns l);
@@ -174,34 +178,12 @@ extern inline void bwrite(struct fastbuf *f, void *b, uns l)
 }
 
 void bbcopy(struct fastbuf *f, struct fastbuf *t, uns l);
-
-extern inline byte *                   /* Non-standard */
-bgets(struct fastbuf *f, byte *b, uns l)
-{
-  byte *e = b + l - 1;
-  int k;
-
-  k = bgetc(f);
-  if (k == EOF)
-    return NULL;
-  while (b < e)
-    {
-      if (k == '\n' || k == EOF)
-       {
-         *b = 0;
-         return b;
-       }
-      *b++ = k;
-      k = bgetc(f);
-    }
-  die("%s: Line too long", f->name);
-}
+byte *bgets(struct fastbuf *f, byte *b, uns l);        /* Non-std */
 
 extern inline void
 bputs(struct fastbuf *f, byte *b)
 {
-  while (*b)
-    bputc(f, *b++);
+  bwrite(f, b, strlen(b));
 }
 
 extern inline void