[gentoo-commits] proj/libbash:master commit in: scripts/, bashast/

["Mu Qiao" <qiaomuf@gentoo.org>]

commit:     14db07b33b4a2df8ede5b8f7b7cda89004009d8d
Author:     André Aparício <aparicio99 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 20 02:25:32 2012 +0000
Commit:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 00:03:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=14db07b3

Parser&Walker: Escape '

---
 bashast/bashast.g              |    3 ++-
 bashast/libbashWalker.g        |    1 +
 scripts/command_execution.bash |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 61c7e57..4438b8c 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -786,7 +786,7 @@ ns_string_part
 	|OTHER|EQUALS|PCT|PCTPCT|PLUS|MINUS|DOT|DOTDOT|COLON
 	|TILDE|LSQUARE|RSQUARE|CARET|POUND|COMMA|EXPORT|LOCAL|DECLARE|AT
 	// Escaped characters
-	|ESC_RPAREN|ESC_LPAREN|ESC_RSQUARE|ESC_LSQUARE|ESC_DOLLAR|ESC_GT|ESC_LT|ESC_TICK|ESC_DQUOTE
+	|ESC_RPAREN|ESC_LPAREN|ESC_RSQUARE|ESC_LSQUARE|ESC_DOLLAR|ESC_GT|ESC_LT|ESC_TICK|ESC_DQUOTE|ESC_SQUOTE
 	// The following is for filename expansion
 	|TIMES|QMARK;
 
@@ -1129,6 +1129,7 @@ SEMIC	:	';';
 DOUBLE_SEMIC	:	';;';
 PIPE	:	'|';
 ESC_DQUOTE	:	'\\"';
+ESC_SQUOTE	: { !double_quoted }? => '\\\'';
 DQUOTE	:	'"' { if(LA(-1) != '\\') double_quoted = !double_quoted; };
 SQUOTE	:	{ double_quoted }? => '\'';
 SINGLE_QUOTED_STRING_TOKEN	:	{ !double_quoted }? => '\'' .* '\'';

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 9c85f9d..34a7660 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -466,6 +466,7 @@ options {backtrack = true;}
 	|ESC_LSQUARE { $libbash_value = "["; }
 	|ESC_DOLLAR { $libbash_value = "$"; }
 	|ESC_DQUOTE { $libbash_value = "\""; }
+	|ESC_SQUOTE { $libbash_value = "'"; }
 	|ESC_GT { $libbash_value = ">"; }
 	|ESC_LT { $libbash_value = "<"; }
 	|ESC_TICK { $libbash_value = "`"; }

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 1cc837b..c526d75 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -96,7 +96,7 @@ eval abc+=\( \"\$@\" \)
 declare MOZILLA_FIVE_HOME="/usr/share/${PN}"
 declare foo=23 empty bar=42
 echo $MOZILLA_FIVE_HOME $foo $lol $bar
-echo \(\)\[\]\$\"\>
+echo \(\)\[\]\$\"\>\'
 
 FILE=scripts/input_output_test
 echo foo > $FILE