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
fprintf(stderr, "got token type %d\n", tok->type);
}
return NULL;
s->ctx = ctx;
isl_ctx_ref(s->ctx);
- s->size = 256;
s->file = NULL;
s->str = NULL;
- s->buffer = isl_alloc_array(ctx, char, s->size);
- if (!s->buffer)
- goto error;
s->len = 0;
s->line = 1;
s->col = 0;
s->tokens[i] = NULL;
s->n_token = 0;
s->keywords = NULL;
+ s->size = 256;
+ s->buffer = isl_alloc_array(ctx, char, s->size);
+ if (!s->buffer)
+ goto error;
return s;
error:
isl_stream_free(s);
struct isl_stream* isl_stream_new_str(struct isl_ctx *ctx, const char *str)
{
- struct isl_stream *s = isl_stream_new(ctx);
- s->str = str;
- return s;
+ struct isl_stream *s = isl_stream_new(ctx);
+ if (!s)
+ return NULL;
+ s->str = str;
+ return s;
}
static int isl_stream_getc(struct isl_stream *s)
{
if (s->len >= s->size) {
s->size = (3*s->size)/2;
- s->buffer = isl_realloc_array(ctx, s->buffer, char, s->size);
+ s->buffer = isl_realloc_array(s->ctx, s->buffer, char, s->size);
if (!s->buffer)
return -1;
}
return ISL_TOKEN_INFTY;
if (!strcasecmp(s->buffer, "NaN"))
return ISL_TOKEN_NAN;
+ if (!strcasecmp(s->buffer, "max"))
+ return ISL_TOKEN_MAX;
if (!s->keywords)
return ISL_TOKEN_IDENT;
return ISL_TOKEN_IDENT;
}
+int isl_stream_skip_line(struct isl_stream *s)
+{
+ int c;
+
+ while ((c = isl_stream_getc(s)) != -1 && c != '\n')
+ /* nothing */
+ ;
+
+ return c == -1 ? -1 : 0;
+}
+
static struct isl_token *next_token(struct isl_stream *s, int same_line)
{
int c;
/* skip spaces and comment lines */
while ((c = isl_stream_getc(s)) != -1) {
if (c == '#') {
- while ((c = isl_stream_getc(s)) != -1 && c != '\n')
- /* nothing */
- ;
- if (c == -1 || (same_line && c == '\n'))
+ if (isl_stream_skip_line(s) < 0)
+ break;
+ c = '\n';
+ if (same_line)
break;
} else if (!isspace(c) || (same_line && c == '\n'))
break;
}
if (c != -1)
isl_stream_ungetc(s, c);
- tok->type = ':';
+ tok->type = (enum isl_token_type) ':';
return tok;
}
if (c == '>') {
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);
return 0;
}
+void isl_stream_flush_tokens(struct isl_stream *s)
+{
+ int i;
+
+ if (!s)
+ return;
+ for (i = 0; i < s->n_token; ++i)
+ isl_token_free(s->tokens[i]);
+ s->n_token = 0;
+}
+
void isl_stream_free(struct isl_stream *s)
{
if (!s)
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);