X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=a3473ca9051100df47bbe96a0062c6d9699e688c;hp=859eba30479b93eeac8fa4a8c00d21d7916931d4;hb=bd5c147d5e39a10469876048df12348dc556c20c;hpb=a77e8d42cd7b983d9fa5746f07e66a6fe04b6a0d

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 859eba3..a3473ca 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -6,6 +6,7 @@
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
 #include "parser.h"
@@ -13,7 +14,7 @@
 
 #define YYLEX_PARAM parser->scanner
 
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -47,6 +48,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
 
@@ -54,59 +58,74 @@ static void yyerror(struct grub2_parser *, char const *s);
 %token	TOKEN_EOL
 %token	TOKEN_DELIM
 %token	<word> TOKEN_WORD
+%token	TOKEN_EOF 0
 
 %start	script
 %debug
 
 %%
 
-script: statements {
+script:	statements {
 		parser->script->statements = $1;
 	}
 
-statements: statement {
+eol:	TOKEN_EOL | TOKEN_EOF;
+
+statements: /* empty */ {
 		$$ = create_statements(parser);
-		statement_append($$, $1);
 	}
-	| statements statement {
+	| statements statement eol {
 		statement_append($1, $2);
 		$$ = $1;
 	}
+	| statements TOKEN_EOL {
+		$$ = $1;
+	}
+
+sep:	TOKEN_DELIM | TOKEN_EOL;
 
-statement: TOKEN_EOL {
-		$$ = NULL;
+conditional: statement TOKEN_EOL "then" sep statements {
+		$$ = create_statement_conditional(parser, $1, $5);
 	}
-	| words TOKEN_EOL {
+
+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);
 	}
 	| '{' statements '}' {
 		$$ = create_statement_block(parser, $2);
 	}
-	| "if" TOKEN_DELIM statement
-		"then" TOKEN_EOL
-		statements
-		"fi" TOKEN_EOL {
-		$$ = 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
+	| "if" TOKEN_DELIM conditional
+		elifs
+		"else" sep
 		statements
-		"else" TOKEN_EOL
-		statements
-		"fi" TOKEN_EOL {
-		$$ = create_statement_if(parser, $3, $6, $9);
+		"fi" {
+		$$ = create_statement_if(parser, $3, $4, $7);
 	}
 	| "function" TOKEN_DELIM word TOKEN_DELIM '{' statements '}' {
 		$$ = create_statement_function(parser, $3, $6);
 	}
 	| "menuentry" TOKEN_DELIM words TOKEN_DELIM
-		'{' statements '}'
-		TOKEN_EOL {
+		'{' statements '}' {
 		$$ = create_statement_menuentry(parser, $3, $6);
 	}
 	| "submenu" TOKEN_DELIM words TOKEN_DELIM
-		'{' statements '}'
-		TOKEN_EOL {
+		'{' statements '}' {
 		/* we just flatten everything */
 		$$ = create_statement_block(parser, $6);
 	}
@@ -127,11 +146,17 @@ word:	TOKEN_WORD
 	}
 
 %%
-void yyerror(struct grub2_parser *parser, char const *s)
+void yyerror(struct grub2_parser *parser, const char *fmt, ...)
 {
-	fprintf(stderr, "%d: error: %s '%s'\n",
-			yyget_lineno(parser->scanner),
-			s, yyget_text(parser->scanner));
+	const char *str;
+	va_list ap;
+
+	va_start(ap, fmt);
+	str = talloc_vasprintf(parser, fmt, ap);
+	va_end(ap);
+
+	pb_log("parse error: %d('%s'): %s\n", yyget_lineno(parser->scanner),
+					yyget_text(parser->scanner), str);
 }
 
 struct grub2_statements *create_statements(struct grub2_parser *parser)
@@ -165,18 +190,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;
 }
 
@@ -186,7 +226,7 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 	struct grub2_statement_block *stmt =
 		talloc(parser, struct grub2_statement_block);
 	stmt->st.type = STMT_TYPE_BLOCK;
-	stmt->st.exec = NULL;
+	stmt->st.exec = statement_block_execute;
 	stmt->statements = stmts;
 	return &stmt->st;
 }
@@ -269,6 +309,7 @@ void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
 	int rc;
 
 	bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+	yyset_lineno(1, parser->scanner);
 
 	rc = yyparse(parser);