From 3e6b777ba7e84ec7cef0492908058d575dae24a2 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 14:02:48 +0530
Subject: [PATCH 1/2] testcase for the last semicolon behavior

---
 conf/tests.rmk                       |  4 ++++
 tests/grub_script_final_semicolon.in | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/grub_script_final_semicolon.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index c5080f58c..fdf554a15 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -50,6 +50,9 @@ grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
 check_SCRIPTS += grub_script_vars1
 grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 
+check_SCRIPTS += grub_script_final_semicolon
+grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -59,6 +62,7 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
+SCRIPTED_TESTS += grub_script_final_semicolon
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in
new file mode 100644
index 000000000..99e55e545
--- /dev/null
+++ b/tests/grub_script_final_semicolon.in
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check <<EOF
+echo one;
+echo one; echo two
+echo one; echo two;
+echo one ; echo two ; 
+echo one ; echo two ; echo three 
+echo one; echo two ; echo three;   
+EOF

From a7447ca6e10fef9ab0a64f91c16ee13d87dd5f30 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 14:03:20 +0530
Subject: [PATCH 2/2] fix for grub_script_final_semicolon test

---
 script/parser.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/parser.y b/script/parser.y
index baf1fd9b5..e8a4cdd2c 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -92,7 +92,7 @@ script: newlines0
         {
           $$ = 0;
         }
-      | script statement delimiter
+      | script statement delimiter newlines0
         {
           struct grub_script_cmdblock *cmdblock;
           cmdblock = (struct grub_script_cmdblock *) $1;