#include <ctype.h>
#include <string.h>
#include <strings.h>
-#include <isl_ctx.h>
-#include "isl_stream.h"
+#include <isl/ctx.h>
+#include <isl/stream.h>
struct isl_keyword {
char *name;
tok->line = line;
tok->col = col;
tok->on_new_line = on_new_line;
+ tok->is_keyword = 0;
+ tok->u.s = NULL;
return tok;
}
return;
if (tok->type == ISL_TOKEN_VALUE)
isl_int_clear(tok->u.v);
- else if (tok->type == ISL_TOKEN_IDENT || tok->type == ISL_TOKEN_STRING)
+ else
free(tok->u.s);
free(tok);
}
if (tok) {
if (tok->type < 256)
fprintf(stderr, "got '%c'\n", tok->type);
+ else if (tok->type == ISL_TOKEN_IDENT)
+ fprintf(stderr, "got ident '%s'\n", tok->u.s);
+ else if (tok->is_keyword)
+ fprintf(stderr, "got keyword '%s'\n", tok->u.s);
+ else if (tok->type == ISL_TOKEN_VALUE) {
+ fprintf(stderr, "got value '");
+ isl_int_print(stderr, tok->u.v, 0);
+ fprintf(stderr, "'\n");
+ } else if (tok->u.s)
+ fprintf(stderr, "got token '%s'\n", tok->u.s);
else
fprintf(stderr, "got token type %d\n", tok->type);
}
s->col = 0;
s->eof = 0;
s->c = -1;
+ s->n_un = 0;
for (i = 0; i < 5; ++i)
s->tokens[i] = NULL;
s->n_token = 0;
return s;
}
-static int isl_stream_getc(struct isl_stream *s)
+static int stream_getc(struct isl_stream *s)
{
int c;
if (s->eof)
return -1;
+ if (s->n_un)
+ return s->c = s->un[--s->n_un];
if (s->file)
c = fgetc(s->file);
else {
static void isl_stream_ungetc(struct isl_stream *s, int c)
{
- if (s->file)
- ungetc(c, s->file);
- else
- --s->str;
+ isl_assert(s->ctx, s->n_un < 5, return);
+ s->un[s->n_un++] = c;
s->c = -1;
}
+static int isl_stream_getc(struct isl_stream *s)
+{
+ int c;
+
+ do {
+ c = stream_getc(s);
+ if (c != '\\')
+ return c;
+ c = stream_getc(s);
+ } while (c == '\n');
+
+ isl_stream_ungetc(s, c);
+
+ return '\\';
+}
+
static int isl_stream_push_char(struct isl_stream *s, int c)
{
if (s->len >= s->size) {
+ char *buffer;
s->size = (3*s->size)/2;
- s->buffer = isl_realloc_array(s->ctx, s->buffer, char, s->size);
- if (!s->buffer)
+ buffer = isl_realloc_array(s->ctx, s->buffer, char, s->size);
+ if (!buffer)
return -1;
+ s->buffer = buffer;
}
s->buffer[s->len++] = c;
return 0;
return ISL_TOKEN_AND;
if (!strcasecmp(s->buffer, "or"))
return ISL_TOKEN_OR;
+ if (!strcasecmp(s->buffer, "not"))
+ return ISL_TOKEN_NOT;
if (!strcasecmp(s->buffer, "infty"))
return ISL_TOKEN_INFTY;
if (!strcasecmp(s->buffer, "infinity"))
return ISL_TOKEN_INFTY;
if (!strcasecmp(s->buffer, "NaN"))
return ISL_TOKEN_NAN;
+ if (!strcasecmp(s->buffer, "min"))
+ return ISL_TOKEN_MIN;
+ if (!strcasecmp(s->buffer, "max"))
+ return ISL_TOKEN_MAX;
+ if (!strcasecmp(s->buffer, "rat"))
+ return ISL_TOKEN_RAT;
+ if (!strcasecmp(s->buffer, "true"))
+ return ISL_TOKEN_TRUE;
+ if (!strcasecmp(s->buffer, "false"))
+ return ISL_TOKEN_FALSE;
+ if (!strcasecmp(s->buffer, "ceild"))
+ return ISL_TOKEN_CEILD;
+ if (!strcasecmp(s->buffer, "floord"))
+ return ISL_TOKEN_FLOORD;
if (!s->keywords)
return ISL_TOKEN_IDENT;
if (c == '(' ||
c == ')' ||
c == '+' ||
- c == '/' ||
c == '*' ||
c == '%' ||
c == '^' ||
c == '=' ||
c == '@' ||
+ c == '$' ||
c == ',' ||
c == '.' ||
c == ';' ||
tok = isl_token_new(s->ctx, line, col, old_line != line);
if (!tok)
return NULL;
+ tok->u.s = strdup("->");
tok->type = ISL_TOKEN_TO;
return tok;
}
isl_int_read(tok->u.v, s->buffer);
return tok;
}
- if (isalpha(c)) {
+ if (isalpha(c) || c == '_') {
tok = isl_token_new(s->ctx, line, col, old_line != line);
if (!tok)
return NULL;
isl_stream_ungetc(s, c);
isl_stream_push_char(s, '\0');
tok->type = check_keywords(s);
- if (tok->type == ISL_TOKEN_IDENT)
- tok->u.s = strdup(s->buffer);
+ if (tok->type != ISL_TOKEN_IDENT)
+ tok->is_keyword = 1;
+ tok->u.s = strdup(s->buffer);
+ if (!tok->u.s)
+ goto error;
return tok;
}
if (c == '"') {
if (!tok)
return NULL;
if ((c = isl_stream_getc(s)) == '=') {
+ tok->u.s = strdup(":=");
tok->type = ISL_TOKEN_DEF;
return tok;
}
if (!tok)
return NULL;
if ((c = isl_stream_getc(s)) == '=') {
+ tok->u.s = strdup(">=");
tok->type = ISL_TOKEN_GE;
return tok;
} else if (c == '>') {
if ((c = isl_stream_getc(s)) == '=') {
+ tok->u.s = strdup(">>=");
tok->type = ISL_TOKEN_LEX_GE;
return tok;
}
+ tok->u.s = strdup(">>");
tok->type = ISL_TOKEN_LEX_GT;
- } else
+ } else {
+ tok->u.s = strdup(">");
tok->type = ISL_TOKEN_GT;
+ }
if (c != -1)
isl_stream_ungetc(s, c);
return tok;
if (!tok)
return NULL;
if ((c = isl_stream_getc(s)) == '=') {
+ tok->u.s = strdup("<=");
tok->type = ISL_TOKEN_LE;
return tok;
} else if (c == '<') {
if ((c = isl_stream_getc(s)) == '=') {
+ tok->u.s = strdup("<<=");
tok->type = ISL_TOKEN_LEX_LE;
return tok;
}
+ tok->u.s = strdup("<<");
tok->type = ISL_TOKEN_LEX_LT;
- } else
+ } else {
+ tok->u.s = strdup("<");
tok->type = ISL_TOKEN_LT;
+ }
if (c != -1)
isl_stream_ungetc(s, c);
return tok;
if (!tok)
return NULL;
tok->type = ISL_TOKEN_AND;
- if ((c = isl_stream_getc(s)) != '&' && c != -1)
+ if ((c = isl_stream_getc(s)) != '&' && c != -1) {
+ tok->u.s = strdup("&");
isl_stream_ungetc(s, c);
+ } else
+ tok->u.s = strdup("&&");
return tok;
}
if (c == '|') {
if (!tok)
return NULL;
tok->type = ISL_TOKEN_OR;
- if ((c = isl_stream_getc(s)) != '|' && c != -1)
+ if ((c = isl_stream_getc(s)) != '|' && c != -1) {
+ tok->u.s = strdup("|");
isl_stream_ungetc(s, c);
+ } else
+ tok->u.s = strdup("||");
+ return tok;
+ }
+ if (c == '/') {
+ tok = isl_token_new(s->ctx, line, col, old_line != line);
+ if (!tok)
+ return NULL;
+ if ((c = isl_stream_getc(s)) != '\\' && c != -1) {
+ tok->type = (enum isl_token_type) '/';
+ isl_stream_ungetc(s, c);
+ } else {
+ tok->u.s = strdup("/\\");
+ tok->type = ISL_TOKEN_AND;
+ }
+ return tok;
+ }
+ if (c == '\\') {
+ tok = isl_token_new(s->ctx, line, col, old_line != line);
+ if (!tok)
+ return NULL;
+ if ((c = isl_stream_getc(s)) != '/' && c != -1) {
+ tok->type = (enum isl_token_type) '\\';
+ isl_stream_ungetc(s, c);
+ } else {
+ tok->u.s = strdup("\\/");
+ tok->type = ISL_TOKEN_OR;
+ }
+ return tok;
+ }
+ if (c == '!') {
+ tok = isl_token_new(s->ctx, line, col, old_line != line);
+ if (!tok)
+ return NULL;
+ tok->type = ISL_TOKEN_NOT;
+ tok->u.s = strdup("!");
return tok;
}
return 0;
}
-static int free_keyword(void *p)
+static int free_keyword(void **p, void *user)
{
- struct isl_keyword *keyword = p;
+ struct isl_keyword *keyword = *p;
free(keyword->name);
free(keyword);
isl_token_free(tok);
}
if (s->keywords) {
- isl_hash_table_foreach(s->ctx, s->keywords, free_keyword);
+ isl_hash_table_foreach(s->ctx, s->keywords, &free_keyword, NULL);
isl_hash_table_free(s->ctx, s->keywords);
}
isl_ctx_deref(s->ctx);