X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=81856dfcaa5a2002fce07a78460a6e1ddb0015d6;hb=bda4feeab43ec0ef8bf2bf63d54d81ab54f3ba51;hp=0540ff3c088b768f106d945d8f1e86ee7660d0e3;hpb=63575c2045b1505da7a2abca8a51a4a7aa3df6f7;p=petitboot

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 0540ff3..81856df 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -47,6 +47,9 @@ static void yyerror(struct grub2_parser *, char const *s);
 
 %type <statement>	statement
 %type <statements>	statements
+%type <statement>	conditional
+%type <statement>	elif
+%type <statements>	elifs
 %type <argv>		words
 %type <word>		word
 
@@ -75,6 +78,22 @@ statements: /* empty */ {
 		$$ = $1;
 	}
 
+conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
+		$$ = create_statement_conditional(parser, $1, $5);
+	}
+
+elif: "elif" TOKEN_DELIM conditional {
+		$$ = $3;
+      }
+
+elifs: /* empty */ {
+		$$ = create_statements(parser);
+	}
+	| elifs elif {
+		statement_append($1, $2);
+		$$ = $1;
+	}
+
 statement:
 	words {
 		   $$ = create_statement_simple(parser, $1);
@@ -82,19 +101,15 @@ statement:
 	| '{' statements '}' {
 		$$ = create_statement_block(parser, $2);
 	}
-	| "if" TOKEN_DELIM statement
-		"then" TOKEN_EOL
-		statements
-		"fi" {
-		$$ = create_statement_if(parser, $3, $6, NULL);
+	| "if" TOKEN_DELIM conditional elifs "fi" {
+		$$ = create_statement_if(parser, $3, $4, NULL);
 	}
-	| "if" TOKEN_DELIM statement
-		"then" TOKEN_EOL
-		statements
+	| "if" TOKEN_DELIM conditional
+		elifs
 		"else" TOKEN_EOL
 		statements
 		"fi" {
-		$$ = create_statement_if(parser, $3, $6, $9);
+		$$ = create_statement_if(parser, $3, $4, $7);
 	}
 	| "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
 		$$ = create_statement_function(parser, $3, $6);
@@ -163,18 +178,33 @@ struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser,
 	return &stmt->st;
 }
 
-struct grub2_statement *create_statement_if(struct grub2_parser *parser,
+struct grub2_statement *create_statement_conditional(
+		struct grub2_parser *parser,
 		struct grub2_statement *condition,
-		struct grub2_statements *true_case,
-		struct grub2_statements *false_case)
+		struct grub2_statements *statements)
+{
+	struct grub2_statement_conditional *stmt =
+		talloc(parser, struct grub2_statement_conditional);
+	stmt->st.type = STMT_TYPE_CONDITIONAL;
+	stmt->condition = condition;
+	stmt->statements = statements;
+	return &stmt->st;
+}
+
+struct grub2_statement *create_statement_if(struct grub2_parser *parser,
+		struct grub2_statement *conditional,
+		struct grub2_statements *elifs,
+		struct grub2_statements *else_case)
 {
 	struct grub2_statement_if *stmt =
 		talloc(parser, struct grub2_statement_if);
+
+	list_add(&elifs->list, &conditional->list);
+
 	stmt->st.type = STMT_TYPE_IF;
 	stmt->st.exec = statement_if_execute;
-	stmt->condition = condition;
-	stmt->true_case = true_case;
-	stmt->false_case = false_case;
+	stmt->conditionals = elifs;
+	stmt->else_case = else_case;
 	return &stmt->st;
 }