/* -*-c-*-
*
- * $Id: scan.c,v 1.5 2002/01/30 09:29:34 mdw Exp $
+ * $Id: scan.c,v 1.6 2002/02/22 23:44:16 mdw Exp $
*
* Character scanners
*
/*----- Revision history --------------------------------------------------*
*
* $Log: scan.c,v $
+ * Revision 1.6 2002/02/22 23:44:16 mdw
+ * Miscellaneous tidying up, to make this code independent of `fw'. It
+ * might end up in a library somewhere.
+ *
* Revision 1.5 2002/01/30 09:29:34 mdw
* Initialize scanner properly.
*
/*----- Header files ------------------------------------------------------*/
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
fscan *fs = (fscan *)ss;
if (!(fs->f & SCF_NOCLOSE))
fclose(fs->fp);
- if (fs->f & SCF_FREENAME)
- free(fs->ss.src);
+ xfree(fs->ss.src);
DESTROY(fs);
}
/* --- @scan_file@ --- *
*
* Arguments: @FILE *fp@ = pointer to file descriptor
- * @char *name@ = pointer to source file name
+ * @const char *name@ = pointer to source file name
* @unsigned f@ = flags
*
* Returns: A scanner source.
* Use: Creates a new scanner source for reading from a file.
*/
-scansrc *scan_file(FILE *fp, char *name, unsigned f)
+scansrc *scan_file(FILE *fp, const char *name, unsigned f)
{
fscan *fs = CREATE(fscan);
fs->ss.ops = &fscan_ops;
- fs->ss.src = name;
+ fs->ss.src = xstrdup(name);
fs->ss.line = 1;
fs->fp = fp;
fs->f = f;
/* --- The end of file marker --- */
-static scansrc scan_eof = { &scan_eof, &eof_ops, "<eof>", 0, EOF };
+static scansrc scan_eof = { &scan_eof, &eof_ops, "<eof>", 0, DSTR_INIT };
/*----- General scanner handling ------------------------------------------*/
int scan(scanner *sc)
{
int ch;
- if (sc->head->pushback != EOF) {
- ch = sc->head->pushback;
- sc->head->pushback = EOF;
- } else {
+ if (sc->head->pushback.len)
+ ch = sc->head->pushback.buf[--sc->head->pushback.len];
+ else {
scansrc *ss = sc->head;
if (ss == &scan_eof)
ch = EOF;
void unscan(scanner *sc, int ch)
{
- sc->head->pushback = ch;
+ DPUTC(&sc->head->pushback, ch);
}
/* --- @scan_push@ --- *
if (sc->head == &scan_eof)
sc->tail = &ss->next;
sc->head = ss;
- ss->pushback = EOF;
+ dstr_create(&ss->pushback);
ss->tok = 0;
ss->t = 0;
}
ss->next = &scan_eof;
*sc->tail = ss;
sc->tail = &ss->next;
- ss->pushback = EOF;
+ dstr_create(&ss->pushback);
ss->tok = 0;
ss->t = 0;
}
scansrc *sss = ss;
ss = ss->next;
if (sss->tok)
- free(sss->tok);
+ xfree(sss->tok);
+ dstr_destroy(&sss->pushback);
sss->ops->destroy(sss);
}
dstr_destroy(&sc->d);
if (scan_eof.tok)
- free(scan_eof.tok);
+ xfree(scan_eof.tok);
scan_eof.tok = 0;
sc->head = &scan_eof;
sc->tail = &sc->head;
/* -*-c-*-
*
- * $Id: scan.h,v 1.3 2002/01/13 14:50:07 mdw Exp $
+ * $Id: scan.h,v 1.4 2002/02/22 23:44:16 mdw Exp $
*
* Character scanners
*
/*----- Revision history --------------------------------------------------*
*
* $Log: scan.h,v $
+ * Revision 1.4 2002/02/22 23:44:16 mdw
+ * Miscellaneous tidying up, to make this code independent of `fw'. It
+ * might end up in a library somewhere.
+ *
* Revision 1.3 2002/01/13 14:50:07 mdw
* Make delimiters be a property of a scanner.
*
struct scansrc_ops *ops; /* Pointer to operations table */
char *src; /* Name of this source */
int line; /* Current line number */
- int pushback; /* Pushback character */
+ dstr pushback; /* Pushback characters */
char *tok; /* Token pushback */
unsigned t; /* Token type pushback */
} scansrc;
/* --- @scan_file@ --- *
*
* Arguments: @FILE *fp@ = pointer to file descriptor
- * @char *name@ = pointer to source file name
+ * @const char *name@ = pointer to source file name
* @unsigned f@ = flags
*
* Returns: A scanner source.
* Use: Creates a new scanner source for reading from a file.
*/
-extern scansrc *scan_file(FILE */*fp*/, char */*name*/, unsigned /*f*/);
+#define SCF_NOCLOSE 1u /* Don't close @fp@ when finished */
-#define SCF_NOCLOSE 1u
-#define SCF_FREENAME 2u
+extern scansrc *scan_file(FILE */*fp*/, const char */*name*/,
+ unsigned /*f*/);
/* --- @scan_argv@ --- *
*