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

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     53f52fea7c45a92771094af3a7dbaa637ecd397a
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 08:22:33 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 08:22:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=53f52fea

Parser: fix a bug in escaped double quote handling

The internal lexer state for handling double quotes should be changed if
the double quote is escaped. Now this is fixed.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 9681cb1..c69edea 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -120,6 +120,11 @@ tokens{
 	bool double_quoted = false;
 #else
 	boolean double_quoted = false;
+
+	int LA(int index)
+	{
+		return input.LA(index);
+	}
 #endif
 }
 
@@ -723,7 +728,7 @@ SEMIC	:	';';
 DOUBLE_SEMIC
 	:	';;';
 PIPE	:	'|';
-DQUOTE	:	'"' { double_quoted = !double_quoted; };
+DQUOTE	:	'"' { if(LA(-1) != '\\') double_quoted = !double_quoted; };
 SQUOTE	:	{ double_quoted }? => '\'';
 SINGLE_QUOTED_STRING_TOKEN	:	{ !double_quoted }? => '\'' .* '\'';
 COMMA	:	',';

diff --git a/scripts/command_execution.bash b/scripts/command_execution.bash
index 33200bd..3d138fd 100644
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@ -64,3 +64,4 @@ echo $FOO010
 echo "abc #av### ##" # for comment
 echo $'abc\tdef\nxyz'
 echo -e "\'\"\t\n"
+echo 'quotes should be handled correctly'