X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=dbdde51fe57fbc7377de1c7132f97d831aeee4e6;hp=2af213218070a0be6cac707b5e51e8fd9a569785;hb=2013dd8075a57e5399f080fa8094cc4b464f35cd;hpb=0ac0cc8dbd8c3687880f3115ae41f9903e9f2333

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 2af2132..dbdde51 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -4,7 +4,13 @@
 %parse-param { struct grub2_parser *parser }
 
 %{
+#include "grub2.h"
+#include "parser.h"
 #include "lexer.h"
+
+#define YYLEX_PARAM parser->scanner
+
+static void yyerror(struct grub2_parser *, char const *s);
 %}
 
 %union {
@@ -41,9 +47,41 @@
 %token	TOKEN_WORD
 
 %start	script
+%debug
 
 %%
 
-script: /* empty */
+script: statements
+	;
+
+statements: statement
+	| statements statement
+	;
+
+statement: TOKEN_EOL
+	| words TOKEN_EOL
+	| '{' statements '}'
+	| "if" TOKEN_DELIM statement
+		"then" TOKEN_EOL
+		statements
+		"fi" TOKEN_EOL
+	| "menuentry" TOKEN_DELIM words TOKEN_DELIM
+		'{' statements '}'
+		TOKEN_EOL
+	;
+
+words:	| word
+	| words TOKEN_DELIM word
+	;
+
+word:	TOKEN_WORD
+	| word TOKEN_WORD
+	;
 
 %%
+void yyerror(struct grub2_parser *parser, char const *s)
+{
+	fprintf(stderr, "%d: error: %s '%s'\n",
+			yyget_lineno(parser->scanner),
+			s, yyget_text(parser->scanner));
+}