Rework the Read_Line class.

ChangeLog

@@ -1,5 +1,12 @@
 2002-11-02  Bruno Haible  <bruno@clisp.org>
 
+	* src/read-line.h (Read_Line::Read_Line): Make FILE* argument
+	mandatory. Move body to read-line.icc.
+	* src/read-line.icc (Read_Line::Read_Line): New constructor.
+	* src/input.h (Input::Input): Add FILE* argument.
+	* src/input.cc (Input::Input): Likewise.
+	* src/main.cc (main): Pass stdin to Input constructor.
+
 	* src/options.h (DEFAULTCHARS): Remove.
 	(Positions::MAX_KEY_POS): Set to 255.
 	(Positions::_positions): Increase array size.

src/input.cc

@@ -29,8 +29,8 @@
 #include <limits.h> /* defines UCHAR_MAX etc. */
 #include "options.h"
 
-Input::Input (Keyword_Factory *keyword_factory)
+Input::Input (FILE *stream, Keyword_Factory *keyword_factory)
-  : _factory (keyword_factory)
+  : Read_Line (stream), _factory (keyword_factory)
 {
 }
 

src/input.h

@@ -32,7 +32,7 @@
 class Input : private Read_Line
 {
 public:
-                        Input (Keyword_Factory *keyword_factory);
+                        Input (FILE *stream, Keyword_Factory *keyword_factory);
   void                  read_keys ();
 private:
 #ifndef strcspn

src/main.cc

@@ -45,12 +45,12 @@ KeywordExt_Factory::create_keyword (const char *allchars, int allchars_length, c
 int
 main (int argc, char *argv[])
 {
-  /* Set the Options. */
+  /* Set the Options.  Open the input file and assign stdin to it.  */
   option.parse_options (argc, argv);
 
   /* Initialize the key word list. */
   KeywordExt_Factory factory;
-  Input inputter (&factory);
+  Input inputter (stdin, &factory);
   inputter.read_keys ();
   /* We can cast the keyword list to KeywordExt_List* because its list
      elements were created by KeywordExt_Factory. */

src/read-line.cc

@@ -1,4 +1,4 @@
-/* Correctly reads an arbitrarily size string.
+/* Correctly reads an arbitrarily long string.
 
    Copyright (C) 1989-1998, 2002 Free Software Foundation, Inc.
    Written by Douglas C. Schmidt <schmidt@ics.uci.edu>

src/read-line.h

@@ -37,7 +37,7 @@ class Read_Line
 public:
 
   /* Initializes the instance with a given input stream.  */
-                        Read_Line (FILE *stream = stdin) : _fp (stream) {}
+                        Read_Line (FILE *stream);
 
   /* Reads the next line and returns it, excluding the terminating newline,
      and ignoring lines starting with '#'.  Returns NULL on error or EOF.
@@ -46,7 +46,8 @@ public:
   char *                read_next_line ();
 
 private:
-  FILE * const          _fp;             /* FILE pointer to the input stream. */
+  /* FILE pointer to the input stream.  */
+  FILE * const          _fp;
 };
 
 #ifdef __OPTIMIZE__

src/read-line.icc

@@ -25,6 +25,13 @@
 //#include <stdio.h>
 //#include "getline.h"
 
+/* Initializes the instance with a given input stream.  */
+INLINE
+Read_Line::Read_Line (FILE *stream)
+  : _fp (stream)
+{
+}
+
 /* Reads the next line and returns it, excluding the terminating newline,
    and ignoring lines starting with '#'.  Returns NULL on error or EOF.
    The storage for the string is dynamically allocated and must be freed