merged with mainline

diff --cc conf/tests.rmk
index 6259ad89fc0161680ef82520a3e0f96ae911f0d5,5f78ea94011a520a1d5467bf934efdee40d9ef32..11e5f2a1a0f5dcd0ee3bff06ef463218b1220bb4
--- 1/conf/tests.rmk
--- 2/conf/tests.rmk
+++ b/conf/tests.rmk
@@@ -53,6 -53,9 +53,12 @@@ grub_script_vars1_SOURCES = tests/grub_
  check_SCRIPTS += grub_script_for1
  grub_script_for1_SOURCES = tests/grub_script_for1.in
  
+ check_SCRIPTS += grub_script_while1
+ grub_script_while1_SOURCES = tests/grub_script_while1.in
+ 
++check_SCRIPTS += grub_script_if
++grub_script_if_SOURCES = tests/grub_script_if.in
++
  check_SCRIPTS += grub_script_blanklines
  grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in
  
@@@ -72,11 -72,10 +75,12 @@@ SCRIPTED_TESTS  = grub_script_echo
  SCRIPTED_TESTS += grub_script_echo_keywords
  SCRIPTED_TESTS += grub_script_vars1
  SCRIPTED_TESTS += grub_script_for1
+ SCRIPTED_TESTS += grub_script_while1
++SCRIPTED_TESTS += grub_script_if
  SCRIPTED_TESTS += grub_script_blanklines
  SCRIPTED_TESTS += grub_script_final_semicolon
- SCRIPTED_TESTS += grub_script_if
  
 +
  # dependencies between tests and testing-tools
  $(SCRIPTED_TESTS): grub-shell grub-shell-tester
  $(FUNCTIONAL_TESTS): functional_test.mod

diff --cc script/parser.y
index 90f3215f3c8c9ec01db8b8b7878b966268159d90,a30dd78b376d758b74fd80fb17ef44e75c8814e5..b5815ea8de809e076b5e3a67087c83ca639eadbf
--- 1/script/parser.y
--- 2/script/parser.y
+++ b/script/parser.y
@@@ -74,8 -74,9 +74,10 @@@
  %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
  
  %type <arglist> word argument arguments0 arguments1
- %type <cmd> script_init script grubcmd ifclause ifcmd forcmd command
- %type <cmd> commands1 menuentry statement
++
+ %type <cmd> script_init script
 -%type <cmd> grubcmd ifcmd forcmd whilecmd untilcmd
++%type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
+ %type <cmd> command commands1 menuentry statement
  
  %pure-parser
  %lex-param   { struct grub_parser_param *state };