Fixed the macro versions of several inline functions.

[cc65] / src / cc65 / input.h

diff --git a/src/cc65/input.h b/src/cc65/input.h
index 662ab2f599ad604c97787380df15f1f1ac68ebc8..7fc90d247d9a58b51f60476c4523c95aac5d21af 100644 (file)
--- a/src/cc65/input.h
+++ b/src/cc65/input.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2000-2004 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,24 +38,40 @@
 
 
 
+#include <stdio.h>
+
+/* common */
+#include "strbuf.h"
+
+
+
 /*****************************************************************************/
 /*                                  data                                    */
 /*****************************************************************************/
 
 
 
-/* Maximum length of an input line and the corresponding char array */
-#define LINEMAX                4095
-#define LINESIZE       LINEMAX+1
+/* The current input line */
+extern StrBuf* Line;
+
+/* Current and next input character */
+extern char CurC;
+extern char NextC;
 
-/* Input line stuff */
-extern char* line;
-extern char* lptr;
+/* Struct that describes an input file */
+typedef struct IFile IFile;
+struct IFile {
+    unsigned       Index;      /* File index */
+    unsigned       Usage;      /* Usage counter */
+    unsigned long   Size;       /* File size */
+    unsigned long   MTime;      /* Time of last modification */
+    char                   Name[1];    /* Name of file (dynamically allocated) */
+};
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                          Code                                    */
 /*****************************************************************************/
 
 
@@ -66,32 +82,31 @@ void OpenMainFile (const char* Name);
 void OpenIncludeFile (const char* Name, unsigned DirSpec);
 /* Open an include file and insert it into the tables. */
 
-int NextLine (void);
-/* Get a line from the current input. Returns 0 on end of file. */
+void NextChar (void);
+/* Read the next character from the input stream and make CurC and NextC
+ * valid. If end of line is reached, both are set to NUL, no more lines
+ * are read by this function.
+ */
 
 void ClearLine (void);
 /* Clear the current input line */
 
+StrBuf* InitLine (StrBuf* Buf);
+/* Initialize Line from Buf and read CurC and NextC from the new input line.
+ * The function returns the old input line.
+ */
+
+int NextLine (void);
+/* Get a line from the current input. Returns 0 on end of file. */
+
 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).
- */
-
-
+void WriteDependencies (FILE* F, const char* OutputFile);
+/* Write a makefile dependency list to the given file */