diff options
Diffstat (limited to 'polly/lib/External/isl/extract_key.c')
| -rw-r--r-- | polly/lib/External/isl/extract_key.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/polly/lib/External/isl/extract_key.c b/polly/lib/External/isl/extract_key.c index 070c1f6265f3..28fbdfdd3096 100644 --- a/polly/lib/External/isl/extract_key.c +++ b/polly/lib/External/isl/extract_key.c @@ -13,17 +13,17 @@ * Return KEY_ERROR on error, i.e., if "tok" does not * correspond to any known key. */ -static KEY extract_key(__isl_keep isl_stream *s, struct isl_token *tok) +static KEY KEY_EXTRACT(__isl_keep isl_stream *s, struct isl_token *tok) { - int type; + isl_bool has_string; char *name; KEY key; isl_ctx *ctx; - if (!tok) + has_string = isl_token_has_str(tok); + if (has_string < 0) return KEY_ERROR; - type = isl_token_get_type(tok); - if (type != ISL_TOKEN_IDENT && type != ISL_TOKEN_STRING) { + if (!has_string) { isl_stream_error(s, tok, "expecting key"); return KEY_ERROR; } @@ -34,7 +34,7 @@ static KEY extract_key(__isl_keep isl_stream *s, struct isl_token *tok) return KEY_ERROR; for (key = 0; key < KEY_END; ++key) { - if (!strcmp(name, key_str[key])) + if (KEY_STR[key] && !strcmp(name, KEY_STR[key])) break; } free(name); @@ -49,13 +49,13 @@ static KEY extract_key(__isl_keep isl_stream *s, struct isl_token *tok) * Return KEY_ERROR on error, i.e., if the first token * on the stream does not correspond to any known key. */ -static KEY get_key(__isl_keep isl_stream *s) +static KEY KEY_GET(__isl_keep isl_stream *s) { struct isl_token *tok; KEY key; tok = isl_stream_next_token(s); - key = extract_key(s, tok); + key = KEY_EXTRACT(s, tok); isl_token_free(tok); return key; |