#include <stdio.h>
#include "_scm.h"
#include "chars.h"
-#include "genio.h"
#include "eval.h"
#include "unif.h"
#include "keywords.h"
#include "srcprop.h"
#include "hashtab.h"
#include "hash.h"
+#include "ports.h"
+#include "root.h"
+#include "strings.h"
+#include "vectors.h"
-#include "scm_validate.h"
+#include "validate.h"
#include "read.h"
\f
"Record positions of source code expressions." },
{ SCM_OPTION_BOOLEAN, "case-insensitive", 0,
"Convert symbols to lower case."},
- { SCM_OPTION_SCM, "keywords", SCM_BOOL_F,
+ { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
"Style of keyword recognition: #f or 'prefix"}
};
c = scm_getc (port);
j = scm_read_token (c, tok_buf, port, 0);
if (j == 1)
- return SCM_MAKICHR (c);
+ return SCM_MAKE_CHAR (c);
if (c >= '0' && c < '8')
{
p = scm_istr2int (SCM_CHARS (*tok_buf), (long) j, 8);
if (SCM_NFALSEP (p))
- return SCM_MAKICHR (SCM_INUM (p));
+ return SCM_MAKE_CHAR (SCM_INUM (p));
}
for (c = 0; c < scm_n_charnames; c++)
if (scm_charnames[c]
&& (scm_casei_streq (scm_charnames[c], SCM_CHARS (*tok_buf))))
- return SCM_MAKICHR (scm_charnums[c]);
+ return SCM_MAKE_CHAR (scm_charnums[c]);
scm_wta (SCM_UNDEFINED, "unknown # object: #\\", SCM_CHARS (*tok_buf));
/* #:SYMBOL is a syntax for keywords supported in all contexts. */
SCM got;
got = scm_apply (sharp,
- SCM_MAKICHR (c),
+ SCM_MAKE_CHAR (c),
scm_acons (port, SCM_EOL, SCM_EOL));
if (SCM_UNSPECIFIED == got)
goto unkshrp;
}
unkshrp:
scm_misc_error (s_scm_read, "Unknown # object: ~S",
- scm_listify (SCM_MAKICHR (c), SCM_UNDEFINED));
+ scm_listify (SCM_MAKE_CHAR (c), SCM_UNDEFINED));
}
case '"':
goto tok;
case ':':
- if (SCM_KEYWORD_STYLE == scm_keyword_prefix)
+ if (SCM_PACK (SCM_KEYWORD_STYLE) == scm_keyword_prefix)
{
j = scm_read_token ('-', tok_buf, port, 0);
p = scm_intern (SCM_CHARS (*tok_buf), j);
if (SCM_NULLP (rest))
return SCM_BOOL_F;
- if (SCM_ICHR (SCM_CAAR (rest)) == c)
+ if (SCM_CHAR (SCM_CAAR (rest)) == c)
return SCM_CDAR (rest);
rest = SCM_CDR (rest);
scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
#include "read.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/