Remove io.*, some cleanup

git-svn-id: svn://svn.cc65.org/cc65/trunk@87 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index fc5a7c4a6f5aa2bd2af38679a26ec97de3fcee11..dfc986d09c9431edeafe7b06a3320c27fb669cfe 100644 (file)
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -45,7 +45,6 @@
 #include "cpu.h"
 #include "error.h"
 #include "global.h"
-#include "io.h"
 #include "litpool.h"
 #include "optimize.h"
 #include "util.h"

diff --git a/src/cc65/compile.c b/src/cc65/compile.c
index 4d62aefe55f34a59b8c757bb6dd720b51c2e1711..1177c51e96363d5cc5144ad03feb53fc3661fcac 100644 (file)
--- a/src/cc65/compile.c
+++ b/src/cc65/compile.c
@@ -45,7 +45,6 @@
 #include "function.h"
 #include "global.h"
 #include "incpath.h"
-#include "io.h"
 #include "litpool.h"
 #include "macrotab.h"
 #include "pragma.h"
@@ -66,7 +65,6 @@ static void Parse (void)
     int comma;
     SymEntry* Entry;
 
-    kill ();
     NextToken ();                      /* "prime" the pump */
     NextToken ();
     while (curtok != TOK_CEOF) {

diff --git a/src/cc65/error.c b/src/cc65/error.c
index dd2d17c57248dd8b31722c4ef106d2f3d4c09412..437b127630199f6591cd65da0e2bf7b1ef12b247 100644 (file)
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -39,7 +39,6 @@
 
 #include "global.h"
 #include "input.h"
-#include "io.h"
 #include "scanner.h"
 #include "stmt.h"
 #include "error.h"

diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 470d690f85c4b337c23336c79acc293fa8b00418..4f1a46858f93a9eed8dd199368ab7d8f32a208ad 100644 (file)
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -22,7 +22,6 @@
 #include "funcdesc.h"
 #include "function.h"
 #include "global.h"
-#include "io.h"
 #include "litpool.h"
 #include "macrotab.h"
 #include "preproc.h"

diff --git a/src/cc65/input.c b/src/cc65/input.c
index 72e157bdbeea57310831ae82b409e95b92010743..4bd910e61a84203574d91669801862ed3d390262 100644 (file)
--- a/src/cc65/input.c
+++ b/src/cc65/input.c
@@ -44,7 +44,6 @@
 #include "error.h"
 #include "global.h"
 #include "incpath.h"
-#include "io.h"
 #include "input.h"
 
 
@@ -55,6 +54,11 @@
 
 
 
+/* Input line stuff */
+static char LineBuf [LINESIZE];
+char* line = LineBuf;
+char* lptr = LineBuf;
+
 /* Maximum count of nested includes */
 #define MAX_INC_NESTING        16
 
@@ -78,7 +82,7 @@ static IFile*   Input    = 0; /* Single linked list of active files   */
 
 
 /*****************************************************************************/
-/*                              struct IFile                                */
+/*                              struct IFile                                */
 /*****************************************************************************/
 
 
@@ -142,7 +146,7 @@ void OpenIncludeFile (const char* Name, unsigned DirSpec)
     /* Check for the maximum include nesting */
     if (IFileCount > MAX_INC_NESTING) {
        PPError (ERR_INCLUDE_NESTING);
-       return;
+       return;
     }
 
     /* Search for the file */
@@ -196,7 +200,7 @@ int NextLine (void)
     int                Done;
 
     /* Setup the line */
-    kill ();
+    ClearLine ();
 
     /* If there is no file open, bail out */
     if (Input == 0) {
@@ -210,8 +214,8 @@ int NextLine (void)
 
                while (fgets (line + Len, LINESIZE - Len, Input->F) == 0) {
 
-           /* eof */
-           kill ();
+           /* Assume EOF */
+           ClearLine ();
 
            /* Leave the current file */
            CloseIncludeFile ();
@@ -232,7 +236,7 @@ int NextLine (void)
        while (Len > 0 && line [Len-1] == '\n') {
            --Len;
        }
-       line [Len] = '\0';
+       line [Len] = '\0';
 
        /* Output the source line in the generated assembler file
         * if requested.
@@ -246,9 +250,9 @@ int NextLine (void)
         */
        if (Len > 0 && line[Len-1] == '\\') {
            line[Len-1] = '\n';         /* Replace by newline */
-       } else {
-           Done = 1;
-       }
+       } else {
+           Done = 1;
+       }
     }
 
     /* Got a line */
@@ -257,13 +261,22 @@ int NextLine (void)
 
 
 
+void ClearLine (void)
+/* Clear the current input line */
+{
+    line [0] = '\0';
+    lptr = line;
+}
+
+
+
 const char* GetCurrentFile (void)
 /* Return the name of the current input file */
 {
     if (Input == 0) {
-       return "(outside file scope)";
+       return "(outside file scope)";
     } else {
-       return Input->Name;
+       return Input->Name;
     }
 }
 
@@ -277,3 +290,39 @@ unsigned GetCurrentLine (void)
 
 
 
+int nch (void)
+/* Get the next char in input stream (the one behind the current one) */
+{
+    if (*lptr == '\0') {
+       return 0;
+    } else {
+       return lptr[1] & 0xFF;
+    }
+}
+
+
+
+int cgch (void)
+/* Get the current character in the input stream and advance line
+ * pointer (unless already at end of line).
+ */
+{
+    if (*lptr == '\0') {
+       return (0);
+    } else {
+       return (*lptr++ & 0xFF);
+    }
+}
+
+
+
+int gch (void)
+/* Get the current character in the input stream and advance line
+ * pointer (no end of line check is performed).
+ */
+{
+    return (*lptr++ & 0xFF);
+}
+
+
+

diff --git a/src/cc65/input.h b/src/cc65/input.h
index e938d6613fac15149dac728b4ce75c769241340f..662ab2f599ad604c97787380df15f1f1ac68ebc8 100644 (file)
--- a/src/cc65/input.h
+++ b/src/cc65/input.h
@@ -38,6 +38,22 @@
 
 
 
+/*****************************************************************************/
+/*                                  data                                    */
+/*****************************************************************************/
+
+
+
+/* Maximum length of an input line and the corresponding char array */
+#define LINEMAX                4095
+#define LINESIZE       LINEMAX+1
+
+/* Input line stuff */
+extern char* line;
+extern char* lptr;
+
+
+
 /*****************************************************************************/
 /*                                  Code                                    */
 /*****************************************************************************/
@@ -53,12 +69,30 @@ void OpenIncludeFile (const char* Name, unsigned DirSpec);
 int NextLine (void);
 /* Get a line from the current input. Returns 0 on end of file. */
 
+void ClearLine (void);
+/* Clear the current input line */
+
 const char* GetCurrentFile (void);
 /* Return the name of the current input file */
 
 unsigned GetCurrentLine (void);
 /* Return the line number in the current input file */
 
+int nch (void);
+/* Get the next char in input stream (the one behind the current one) */
+
+int cgch (void);
+/* Get the current character in the input stream and advance line
+ * pointer (unless already at end of line).
+ */
+
+int gch (void);
+/* Get the current character in the input stream and advance line
+ * pointer (no end of line check is performed).
+ */
+
+
+
 
 
 /* End of input.h */

diff --git a/src/cc65/io.c b/src/cc65/io.c
deleted file mode 100644 (file)
index 7e24cf3..0000000
--- a/src/cc65/io.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/* C I/O functions */
-
-#include "global.h"
-#include "io.h"
-
-
-
-/*****************************************************************************/
-/*                                  data                                    */
-/*****************************************************************************/
-
-
-
-/* Input line stuff */
-char linebuf [LINESIZE];
-char* line = linebuf;
-char* lptr = 0;
-
-
-
-/*****************************************************************************/
-/*                                  code                                    */
-/*****************************************************************************/
-
-
-
-int nch (void)
-/* Get the next char in input stream (the one behind the current one) */
-{
-    if (*lptr == '\0') {
-       return 0;
-    } else {
-       return lptr[1] & 0xFF;
-    }
-}
-
-
-
-int cgch (void)
-/* Get the current character in the input stream and advance line
- * pointer (unless already at end of line).
- */
-{
-    if (*lptr == '\0') {
-       return (0);
-    } else {
-       return (*lptr++ & 0xFF);
-    }
-}
-
-
-
-int gch (void)
-/* Get the current character in the input stream and advance line
- * pointer (no end of line check is performed).
- */
-{
-    return (*lptr++ & 0xFF);
-}
-
-
-
-void kill (void)
-/* Reset input line pointer, clear input line */
-{
-    lptr = line;
-    *lptr = '\0';
-}
-
-
-

diff --git a/src/cc65/io.h b/src/cc65/io.h
deleted file mode 100644 (file)
index 0bf1597..0000000
--- a/src/cc65/io.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * io.h
- *
- * Ullrich von Bassewitz, 19.06.1998
- */
-
-
-
-#ifndef IO_H
-#define IO_H
-
-
-
-#include <stdio.h>
-
-
-
-/*****************************************************************************/
-/*                                  data                                    */
-/*****************************************************************************/
-
-
-
-/* Maximum length of an input line and the corresponding char array */
-#define LINEMAX                4095
-#define LINESIZE       LINEMAX+1
-
-/* Maximum number of nested input files */
-#define MAXFILES       16
-
-/* Input line stuff */
-extern char linebuf [LINESIZE];
-extern char* line;
-extern char* lptr;
-
-/* File table entry */
-struct filent {
-    FILE* f_iocb;
-    char* f_name;
-    int   f_ln;
-};
-
-
-
-/*****************************************************************************/
-/*                                  code                                    */
-/*****************************************************************************/
-
-
-
-void kill (void);
-/* Reset input line pointer, clear input line */
-
-int nch (void);
-/* Get the next char in input stream (the one behind the current one) */
-
-int cgch (void);
-/* Get the current character in the input stream and advance line
- * pointer (unless already at end of line).
- */
-
-int gch (void);
-/* Get the current character in the input stream and advance line
- * pointer (no end of line check is performed).
- */
-
-
-
-/* End of io.h */
-
-#endif
-
-
-

diff --git a/src/cc65/litpool.h b/src/cc65/litpool.h
index f168d89cf01bf86d95a6ac71794facdfd0ec3edf..3cd69846bfac8001edeec374a40c43cef8b6e442 100644 (file)
--- a/src/cc65/litpool.h
+++ b/src/cc65/litpool.h
@@ -38,6 +38,10 @@
 
 
 
+#include <stdio.h>
+
+
+
 /*****************************************************************************/
 /*                                  Data                                    */
 /*****************************************************************************/

diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak
index 14981122181f0adc8670ec5659d3cf84d8bd7367..92d7fe7bcae5fb222bf0f995b9a9cfb7a756e501 100644 (file)
--- a/src/cc65/make/gcc.mak
+++ b/src/cc65/make/gcc.mak
@@ -29,7 +29,6 @@ OBJS =        anonname.o      \
        ident.o         \
        incpath.o       \
        input.o         \
-       io.o            \
        litpool.o       \
        locals.o        \
        loop.o          \

diff --git a/src/cc65/make/watcom.mak b/src/cc65/make/watcom.mak
index 5d49e31b73abe33be10147fde28187502a49439b..98e6029322d3737320f57ab02bed7fb3a0048d78 100644 (file)
--- a/src/cc65/make/watcom.mak
+++ b/src/cc65/make/watcom.mak
@@ -83,7 +83,6 @@ OBJS =        anonname.obj    \
        ident.obj       \
        incpath.obj     \
        input.obj       \
-       io.obj          \
        litpool.obj     \
        locals.obj      \
        loop.obj        \

diff --git a/src/cc65/optimize.c b/src/cc65/optimize.c
index 66dfd53e23d355b8c4a418c278421d9303c2174a..9be2e5d4cc67f77455847e356451a62b0f84ee68 100644 (file)
--- a/src/cc65/optimize.c
+++ b/src/cc65/optimize.c
@@ -34,6 +34,7 @@
 
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -45,7 +46,6 @@
 #include "cpu.h"
 #include "error.h"
 #include "global.h"
-#include "io.h"
 #include "optimize.h"
 
 

diff --git a/src/cc65/pragma.c b/src/cc65/pragma.c
index 9713f8af05be7af6f9e7d8457ed03d1c227d95fa..511eddb59cab599bbcdd2623a3deb0d29f1d91a0 100644 (file)
--- a/src/cc65/pragma.c
+++ b/src/cc65/pragma.c
@@ -38,7 +38,6 @@
 
 #include "global.h"
 #include "error.h"
-#include "io.h"
 #include "litpool.h"
 #include "symtab.h"
 #include "preproc.h"

diff --git a/src/cc65/preproc.c b/src/cc65/preproc.c
index d27e8e2b9035cb1c6b5ba9a1cbd8d8c6c3496dfe..835a5ff4f54a260398275240a02d49e18c207b29 100644 (file)
--- a/src/cc65/preproc.c
+++ b/src/cc65/preproc.c
@@ -16,7 +16,6 @@
 #include "ident.h"
 #include "incpath.h"
 #include "input.h"
-#include "io.h"
 #include "macrotab.h"
 #include "scanner.h"
 #include "util.h"
@@ -154,11 +153,11 @@ static char* CopyQuotedString (int Quote, char* Target)
 
 
 static int macname (char *sname)
-/* Get macro symbol name.  If error, print message and kill line. */
+/* Get macro symbol name.  If error, print message and clear line. */
 {
     if (issym (sname) == 0) {
        PPError (ERR_IDENT_EXPECTED);
-       kill ();
+       ClearLine ();                                        
        return 0;
     } else {
        return 1;
@@ -319,7 +318,7 @@ static void ExpandMacro (Macro* M)
     if (M->ArgCount >= 0) {
        /* Function like macro */
                if (MacroCall (M) == 0) {
-           kill ();
+           ClearLine ();
        }
     } else {
        /* Just copy the replacement text */
@@ -371,7 +370,7 @@ static void addmac (void)
        }
        if (*lptr != ')') {
                    PPError (ERR_RPAREN_EXPECTED);
-           kill ();
+           ClearLine ();
            return;
        }
        gch ();
@@ -677,8 +676,10 @@ static void doinclude (void)
     xfree (Name);
 
 Done:
-    /* clear rest of line so next read will come from new file (if open) */
-    kill ();
+    /* Clear the remaining line so the next input will come from the new 
+     * file (if open) 
+     */
+    ClearLine ();
 }
 
 
@@ -694,7 +695,7 @@ static void doerror (void)
     }
 
     /* clear rest of line */
-    kill ();
+    ClearLine ();
 }
 
 
@@ -771,7 +772,7 @@ void preprocess (void)
            }
            if (!issym (sname)) {
                PPError (ERR_CPP_DIRECTIVE_EXPECTED);
-               kill ();
+               ClearLine ();
            } else {
                        switch (searchtok (sname, pre_toks)) {
 
@@ -828,7 +829,7 @@ void preprocess (void)
                        /* Not allowed in strict ANSI mode */
                        if (ANSI) {
                            PPError (ERR_CPP_DIRECTIVE_EXPECTED);
-                           kill ();
+                           ClearLine ();
                        }
                        break;
 
@@ -849,7 +850,7 @@ void preprocess (void)
 
                    default:
                        PPError (ERR_CPP_DIRECTIVE_EXPECTED);
-                       kill ();
+                       ClearLine ();
                }
            }
 

diff --git a/src/cc65/scanner.c b/src/cc65/scanner.c
index 014286ff6e663f9cd84b2c06ba6ed23833f1d1d2..ce0aa178886b416f4678bdf5b01190e6c695176d 100644 (file)
--- a/src/cc65/scanner.c
+++ b/src/cc65/scanner.c
@@ -19,7 +19,6 @@
 #include "global.h"
 #include "ident.h"
 #include "input.h"
-#include "io.h"
 #include "litpool.h"
 #include "preproc.h"
 #include "symtab.h"

diff --git a/src/cc65/symtab.c b/src/cc65/symtab.c
index 40f1661e86a739bc5d8320dd3075d64a9e49797e..28288df6c09635e3065f6855d51bd87f54f11cc6 100644 (file)
--- a/src/cc65/symtab.c
+++ b/src/cc65/symtab.c
@@ -50,7 +50,6 @@
 #include "error.h"
 #include "funcdesc.h"
 #include "global.h"
-#include "io.h"
 #include "symentry.h"
 #include "symtab.h"