X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/b4309c3c5aaaf14b91c9adbec5a668e7013774fe..e40ffcb6bda47a508fe90822ef892ba0968f2315:/libguile/read.h

diff --git a/libguile/read.h b/libguile/read.h
index 2c1d08057..f5e21ca9e 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,12 +41,12 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 
 
 #include "libguile/__scm.h"
 
+#include "libguile/options.h"
 
 
 /* SCM_LINE_INCREMENTORS are the characters which cause the line count to
@@ -66,39 +67,26 @@
 
 #define SCM_WHITE_SPACES  SCM_SINGLE_SPACES: case '\t'
 
-#ifdef READER_EXTENSIONS
 extern scm_option scm_read_opts[];
 
 #define SCM_COPY_SOURCE_P      scm_read_opts[0].val
 #define SCM_RECORD_POSITIONS_P scm_read_opts[1].val
-#define SCM_N_READ_OPTIONS 2
-#endif
+#define SCM_CASE_INSENSITIVE_P scm_read_opts[2].val
+#define SCM_KEYWORD_STYLE      scm_read_opts[3].val
+#define SCM_N_READ_OPTIONS 4
 
 
 
-#ifdef __STDC__
-extern SCM scm_read_options (SCM setting);
-extern SCM scm_read (SCM port, SCM casep, SCM sharp);
-extern char * scm_grow_tok_buf (SCM * tok_buf);
-extern int scm_flush_ws (SCM port, char *eoferr);
-extern int scm_casei_streq (char * s1, char * s2);
-extern SCM scm_lreadr (SCM * tok_buf, SCM port, int case_i, SCM sharp);
-extern scm_sizet scm_read_token (int ic, SCM * tok_buf, SCM port, int case_i, int weird);
-extern SCM scm_lreadparen (SCM * tok_buf, SCM port, char *name, int case_i, SCM sharp);
-extern void scm_init_read (void);
-
-#else /* STDC */
-extern SCM scm_read_options ();
-extern SCM scm_read ();
-extern char * scm_grow_tok_buf ();
-extern int scm_flush_ws ();
-extern int scm_casei_streq ();
-extern SCM scm_lreadr ();
-extern scm_sizet scm_read_token ();
-extern SCM scm_lreadparen ();
-extern void scm_init_read ();
-
-#endif /* STDC */
-
+extern SCM scm_read_options SCM_P ((SCM setting));
+extern SCM scm_read SCM_P ((SCM port));
+extern char * scm_grow_tok_buf SCM_P ((SCM * tok_buf));
+extern int scm_flush_ws SCM_P ((SCM port, char *eoferr));
+extern int scm_casei_streq SCM_P ((char * s1, char * s2));
+extern SCM scm_lreadr SCM_P ((SCM * tok_buf, SCM port, SCM *copy));
+extern scm_sizet scm_read_token SCM_P ((int ic, SCM * tok_buf, SCM port, int weird));
+extern SCM scm_lreadparen SCM_P ((SCM * tok_buf, SCM port, char *name, SCM *copy));
+extern SCM scm_lreadrecparen SCM_P ((SCM * tok_buf, SCM port, char *name, SCM *copy));
+extern SCM scm_read_hash_extend SCM_P ((SCM chr, SCM proc));
+extern void scm_init_read SCM_P ((void));
 
 #endif  /* READH */