use -O1 optimization level for gcc 4.2

[platform/upstream/isl.git] / isl_stream.c

diff --git a/isl_stream.c b/isl_stream.c
index d22d3fa..8d4fca7 100644 (file)
--- a/isl_stream.c
+++ b/isl_stream.c
@@ -145,15 +145,18 @@ void isl_stream_push_token(struct isl_stream *s, struct isl_token *tok)
        s->tokens[s->n_token++] = tok;
 }
 
-struct isl_token *isl_stream_next_token(struct isl_stream *s)
+static struct isl_token *next_token(struct isl_stream *s, int same_line)
 {
        int c;
        struct isl_token *tok = NULL;
        int line, col;
        int old_line = s->line;
 
-       if (s->n_token)
+       if (s->n_token) {
+               if (same_line && s->tokens[s->n_token - 1]->on_new_line)
+                       return NULL;
                return s->tokens[--s->n_token];
+       }
 
        s->len = 0;
 
@@ -163,16 +166,16 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
                        while ((c = isl_stream_getc(s)) != -1 && c != '\n')
                                /* nothing */
                                ;
-                       if (c == -1)
+                       if (c == -1 || (same_line && c == '\n'))
                                break;
-               } else if (!isspace(c))
+               } else if (!isspace(c) || (same_line && c == '\n'))
                        break;
        }
 
        line = s->line;
        col = s->col;
 
-       if (c == -1)
+       if (c == -1 || (same_line && c == '\n'))
                return NULL;
        if (c == '(' ||
            c == ')' ||
@@ -204,6 +207,13 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
                }
                if (c != -1)
                        isl_stream_ungetc(s, c);
+               if (!isdigit(c)) {
+                       tok = isl_token_new(s->ctx, line, col, old_line != line);
+                       if (!tok)
+                               return NULL;
+                       tok->type = (enum isl_token_type) '-';
+                       return tok;
+               }
        }
        if (c == '-' || isdigit(c)) {
                tok = isl_token_new(s->ctx, line, col, old_line != line);
@@ -218,12 +228,8 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
                                goto error;
                if (c != -1)
                        isl_stream_ungetc(s, c);
-               if (s->len == 1 && s->buffer[0] == '-')
-                       isl_int_set_si(tok->u.v, -1);
-               else {
-                       isl_stream_push_char(s, '\0');
-                       isl_int_read(tok->u.v, s->buffer);
-               }
+               isl_stream_push_char(s, '\0');
+               isl_int_read(tok->u.v, s->buffer);
                return tok;
        }
        if (isalpha(c)) {
@@ -235,9 +241,17 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
                        isl_stream_push_char(s, c);
                if (c != -1)
                        isl_stream_ungetc(s, c);
+               while ((c = isl_stream_getc(s)) != -1 && c == '\'')
+                       isl_stream_push_char(s, c);
+               if (c != -1)
+                       isl_stream_ungetc(s, c);
                isl_stream_push_char(s, '\0');
                if (!strcasecmp(s->buffer, "exists"))
                        tok->type = ISL_TOKEN_EXISTS;
+               else if (!strcasecmp(s->buffer, "and"))
+                       tok->type = ISL_TOKEN_AND;
+               else if (!strcasecmp(s->buffer, "or"))
+                       tok->type = ISL_TOKEN_OR;
                else {
                        tok->type = ISL_TOKEN_IDENT;
                        tok->u.s = strdup(s->buffer);
@@ -246,27 +260,31 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
        }
        if (c == '>') {
                int c;
+               tok = isl_token_new(s->ctx, line, col, old_line != line);
+               if (!tok)
+                       return NULL;
                if ((c = isl_stream_getc(s)) == '=') {
-                       tok = isl_token_new(s->ctx, line, col, old_line != line);
-                       if (!tok)
-                               return NULL;
                        tok->type = ISL_TOKEN_GE;
                        return tok;
                }
                if (c != -1)
                        isl_stream_ungetc(s, c);
+               tok->type = ISL_TOKEN_GT;
+               return tok;
        }
        if (c == '<') {
                int c;
+               tok = isl_token_new(s->ctx, line, col, old_line != line);
+               if (!tok)
+                       return NULL;
                if ((c = isl_stream_getc(s)) == '=') {
-                       tok = isl_token_new(s->ctx, line, col, old_line != line);
-                       if (!tok)
-                               return NULL;
                        tok->type = ISL_TOKEN_LE;
                        return tok;
                }
                if (c != -1)
                        isl_stream_ungetc(s, c);
+               tok->type = ISL_TOKEN_LT;
+               return tok;
        }
        if (c == '&') {
                tok = isl_token_new(s->ctx, line, col, old_line != line);
@@ -277,6 +295,15 @@ struct isl_token *isl_stream_next_token(struct isl_stream *s)
                        isl_stream_ungetc(s, c);
                return tok;
        }
+       if (c == '|') {
+               tok = isl_token_new(s->ctx, line, col, old_line != line);
+               if (!tok)
+                       return NULL;
+               tok->type = ISL_TOKEN_OR;
+               if ((c = isl_stream_getc(s)) != '|' && c != -1)
+                       isl_stream_ungetc(s, c);
+               return tok;
+       }
 
        tok = isl_token_new(s->ctx, line, col, old_line != line);
        if (!tok)
@@ -288,6 +315,16 @@ error:
        return NULL;
 }
 
+struct isl_token *isl_stream_next_token(struct isl_stream *s)
+{
+       return next_token(s, 0);
+}
+
+struct isl_token *isl_stream_next_token_on_same_line(struct isl_stream *s)
+{
+       return next_token(s, 1);
+}
+
 int isl_stream_eat(struct isl_stream *s, int type)
 {
        struct isl_token *tok;