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

[Petteri Räty]

commit:     4e7532418091e60ba632350eb865698dd208e968
Author:     André Aparício <aparicio99 <AT> gmail <DOT> com>
AuthorDate: Thu Jul  5 02:00:22 2012 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 01:20:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=4e753241

 Parser: Support line continuation inside keyword test

---
 bashast/bashast.g             |    4 ++--
 scripts/compound_command.bash |   22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 2d425ce..0fb8212 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -614,9 +614,9 @@ condition_expr
 #endif
 
 keyword_condition_and
-	:	keyword_condition_primary (BLANK!? LOGICAND^ BLANK!? keyword_condition_primary)*;
+	:	keyword_condition_primary ( wspace!? LOGICAND^ wspace!? keyword_condition_primary)*;
 keyword_condition
-	:	keyword_condition_and (BLANK!? LOGICOR^ BLANK!? keyword_condition_and)*;
+	:	keyword_condition_and ( wspace!? LOGICOR^ wspace!? keyword_condition_and)*;
 keyword_negation_primary
 	:	BANG BLANK keyword_condition_primary -> ^(NEGATION keyword_condition_primary);
 keyword_condition_primary

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index fe3eac4..f328f85 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -385,3 +385,25 @@ case ${EAPI} in
     *)  
         echo "Unknown EAPI=${EAPI} for ruby-ng.eclass"
 esac
+
+if [[   1 == 0 ||
+        1 == 0
+|| 1 == 0
+        || 1 == 0 || # Extra space here
+        1 == 1 ]]; then
+        echo or
+fi
+
+if [[   1 == 1 # Extra space here
+        && 1 == 1 && 1 == 1 &&
+        1 == 1&&
+        1 == 1 ]]; then
+        echo and
+fi
+
+if [[   1 == 1 &&
+        1 == 0 || 1 == 1
+        && 1 == 1 ||
+        1 == 1 && 1 == 1 ]]; then
+        echo and or
+fi