summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--glcpp/glcpp-parse.y11
1 files changed, 11 insertions, 0 deletions
diff --git a/glcpp/glcpp-parse.y b/glcpp/glcpp-parse.y
index 37c2f97c23..c314e9556c 100644
--- a/glcpp/glcpp-parse.y
+++ b/glcpp/glcpp-parse.y
@@ -249,6 +249,17 @@ control_line:
_token_list_append_list (expanded, $2);
glcpp_parser_lex_from (parser, expanded);
}
+| HASH_ELIF NEWLINE {
+ /* #elif without an expression results in a warning if the
+ * condition doesn't matter (we just handled #if 1 or such)
+ * but an error otherwise. */
+ if (parser->skip_stack != NULL && parser->skip_stack->type == SKIP_NO_SKIP) {
+ parser->skip_stack->type = SKIP_TO_ENDIF;
+ glcpp_warning(& @1, parser, "ignoring illegal #elif without expression");
+ } else {
+ glcpp_error(& @1, parser, "#elif needs an expression");
+ }
+ }
| HASH_ELSE NEWLINE {
_glcpp_parser_skip_stack_change_if (parser, & @1, "else", 1);
}