From 25f01e69f946c37a74de8646a3cd047f849885bc Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Wed, 20 May 2020 12:47:28 -0700
Subject: small renaming

---
 sys/cmd/cc/lex.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'sys/cmd/cc/lex.c')

diff --git a/sys/cmd/cc/lex.c b/sys/cmd/cc/lex.c
index 4cc1259..7a08373 100644
--- a/sys/cmd/cc/lex.c
+++ b/sys/cmd/cc/lex.c
@@ -28,7 +28,7 @@ puttok(Token tok)
 int
 getbyte(Lexer *lx)
 {
-    return bufio·getbyte(&lx->io->buf);
+    return bufio·getbyte(&lx->io->rdr);
 }
 
 int
@@ -58,20 +58,20 @@ getnsbyte(Lexer *lx)
 rune
 getrune(Lexer *lx)
 {
-    return bufio·getrune(&lx->io->buf);
+    return bufio·getrune(&lx->io->rdr);
 }
 
 byte
 ungetbyte(Lexer *lx)
 {
     byte b;
-    return bufio·ungetbyte(&lx->io->buf, b);
+    return bufio·ungetbyte(&lx->io->rdr, b);
 }
 
 rune
 ungetrune(Lexer *l, rune r)
 {
-    return bufio·ungetrune(&l->io->buf, r);
+    return bufio·ungetrune(&l->io->rdr, r);
 }
 
 // -----------------------------------------------------------------------
@@ -637,9 +637,8 @@ Dispatch:
         sym = lookup(&lx->sym, tok.val.s);
         if (sym && ((uintptr)sym->name != (uintptr)lx->io->path)) {
             io = makeio(sym->name);
-            printf("EXPANDING MACRO %s\n", sym->name);
-            io->buf.end   += expandmacro(lx, sym, io->b);
-            *io->buf.end++ = EOF;
+            io->rdr.end   += expandmacro(lx, sym, io->b);
+            *io->rdr.end++ = EOF;
             pushio(lx, io);
             goto GetByte;
         }
-- 
cgit v1.2.1