make parenthesis as valid word characters

diff --git a/ChangeLog.lexer-rewrite b/ChangeLog.lexer-rewrite
index 56c63797627db7d62fe57a58e0bf1baf5ba75748..9b2ab9e2f178381f083a20ef937ce5c4ae31ffe4 100644 (file)
--- a/ChangeLog.lexer-rewrite
+++ b/ChangeLog.lexer-rewrite
@@ -1,3 +1,8 @@
+2010-01-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+       * script/yylex.l: Accept parenthesis as part of word.
+       * script/parser.y: Remove GRUB_PARSER_TOKEN_{LPAR,RPAR} tokens.
+
 2010-01-10  BVK Chaitanya  <bvk.groups@gmail.com>
 
        * conf/any-emu.rmk: Build rule updates.

diff --git a/script/parser.y b/script/parser.y
index b8d9818666f4504861f67d879251062387b4fad8..baf1fd9b5a82e1ffd519194a6cd99f8cb51cc790 100644 (file)
--- a/script/parser.y
+++ b/script/parser.y
@@ -45,8 +45,6 @@
 %token GRUB_PARSER_TOKEN_PIPE    "|"
 %token GRUB_PARSER_TOKEN_AMP     "&"
 %token GRUB_PARSER_TOKEN_SEMI    ";"
-%token GRUB_PARSER_TOKEN_LPAR    "("
-%token GRUB_PARSER_TOKEN_RPAR    ")"
 %token GRUB_PARSER_TOKEN_LBR     "{"
 %token GRUB_PARSER_TOKEN_RBR     "}"
 %token GRUB_PARSER_TOKEN_NOT     "!"

diff --git a/script/yylex.l b/script/yylex.l
index 7cef8496bca9d9e69be0b3511663c49450c8f52b..db276ef61e90338edd200dad371d3b12cee1b1a7 100644 (file)
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -128,7 +128,7 @@ typedef grub_size_t yy_size_t;
 BLANK           [ \t]
 COMMENT         ^[ \t]*#.*$
 
-CHAR            [^|&$;()<> \t\n\'\"\\]
+CHAR            [^|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
@@ -157,8 +157,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 "|"             { RECORD; return GRUB_PARSER_TOKEN_PIPE;    }
 "&"             { RECORD; return GRUB_PARSER_TOKEN_AMP;     }
 ";"             { RECORD; return GRUB_PARSER_TOKEN_SEMI;    }
-"("             { RECORD; return GRUB_PARSER_TOKEN_LPAR;    }
-")"             { RECORD; return GRUB_PARSER_TOKEN_RPAR;    }
 "<"             { RECORD; return GRUB_PARSER_TOKEN_LT;      }
 ">"             { RECORD; return GRUB_PARSER_TOKEN_GT;      }