| 1 |
commit: 87a0cae1ba715974d44dce107f330d392583edae |
| 2 |
Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 14:50:16 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 14:58:45 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=87a0cae1 |
| 7 |
|
| 8 |
Walker: support if statement |
| 9 |
|
| 10 |
--- |
| 11 |
bashast/bashast.g | 3 +- |
| 12 |
bashast/features_script/features.sh.ast | 2 +- |
| 13 |
bashast/gunit/compound.gunit | 8 ++-- |
| 14 |
bashast/gunit/pipeline.gunit | 2 +- |
| 15 |
bashast/libbashWalker.g | 62 ++++++++++++++++++++++++++++++- |
| 16 |
scripts/compound_command.bash | 36 ++++++++++++++++++ |
| 17 |
scripts/compound_command.bash.result | 6 +++ |
| 18 |
7 files changed, 111 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/bashast/bashast.g b/bashast/bashast.g |
| 21 |
index b079d07..8018d31 100644 |
| 22 |
--- a/bashast/bashast.g |
| 23 |
+++ b/bashast/bashast.g |
| 24 |
@@ -41,6 +41,7 @@ tokens{ |
| 25 |
FOR_INIT; |
| 26 |
FOR_COND; |
| 27 |
FOR_MOD; |
| 28 |
+ IF_STATEMENT; |
| 29 |
FNAME; |
| 30 |
OP; |
| 31 |
PRE_INCR; |
| 32 |
@@ -194,7 +195,7 @@ for_expr: FOR BLANK+ name (wspace IN (BLANK+ fname)+)? semiel DO wspace* clist s |
| 33 |
sel_expr: SELECT BLANK+ name (wspace IN BLANK+ word)? semiel DO wspace* clist semiel DONE -> ^(SELECT name (word)? clist) |
| 34 |
; |
| 35 |
if_expr : IF wspace+ ag=clist semiel THEN wspace+ iflist=clist semiel EOL* (elif_expr)* (ELSE wspace+ else_list=clist semiel EOL*)? FI |
| 36 |
- -> ^(IF $ag $iflist (elif_expr)* ^($else_list)?) |
| 37 |
+ -> ^(IF_STATEMENT ^(IF $ag $iflist) (elif_expr)* ^(ELSE $else_list)?) |
| 38 |
; |
| 39 |
elif_expr |
| 40 |
: ELIF BLANK+ ag=clist semiel THEN wspace+ iflist=clist semiel -> ^(IF["if"] $ag $iflist); |
| 41 |
|
| 42 |
diff --git a/bashast/features_script/features.sh.ast b/bashast/features_script/features.sh.ast |
| 43 |
index 54f701c..cb84939 100644 |
| 44 |
--- a/bashast/features_script/features.sh.ast |
| 45 |
+++ b/bashast/features_script/features.sh.ast |
| 46 |
@@ -1 +1 @@ |
| 47 |
-(LIST (function (STRING lots_o_echo) (CURRENT_SHELL (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING The number of tests that have failed : (VAR_REF failedtests)))) (COMMAND (STRING echo) (STRING (SINGLE_QUOTED_STRING $ failedtests))) (COMMAND (STRING echo) (STRING (VAR_REF failedtests)))))) (function (STRING do_some_arith) (CURRENT_SHELL (LIST (COMPOUND_ARITH (* 5 4)) (COMPOUND_ARITH (** 5 4)) (COMPOUND_ARITH (+ (VAR_REF (VAR_REF failedtests)) (/ 5 4))) (COMPOUND_ARITH (+ (VAR_REF (VAR_REF z)) (MINUS_SIGN 3)))))) (function (STRING arrays) (SUBSHELL (LIST (VARIABLE_DEFINITIONS (= asdf (ARRAY (STRING a) (STRING b) (STRING c) (STRING d)))) (COMMAND (STRING echo) (STRING (VAR_REF (asdf 3)))) (VARIABLE_DEFINITIONS (= foo (ARRAY (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING 6))))) (STRING b) (STRING c) (STRING d)))) (VARIABLE_DEFINITIONS (= (arr (VAR_REF foo)) (STRING 3))) (VARIABLE_DEFINITIONS (= bar (ARRAY (STRING a) (STRING b) (= 5 (STRING c |
| 48 |
)))))))) (COMMAND (STRING echo) (STRING (BRACE_EXP (STRING a) (STRING b)))) (COMMAND (STRING echo) (STRING (BRACE_EXP (.. a d)))) (COMMAND (STRING echo) (STRING (BRACE_EXP (BRACE_EXP (STRING a) (STRING b)) (STRING c) (STRING d)))) (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRING c)))) (COMMAND (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING foobar)))))) (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING gunit) (REDIR >> (STRING filelist)))) (case (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING asdf)))) (CASE_PATTERN (STRING gz) (LIST (COMMAND (STRING echo) (STRING yay)))) (CASE_PATTERN (STRING bzip) (LIST (COMMAND (STRING echo) (STRING three)))) (CASE_PATTERN (STRING *) (LIST (COMMAND (STRING echo) (STRING woo))))) (for each (STRING (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING log)))))) (LIST (COMMAND (STRING echo) (STRING (VAR_REF each))) (COMMAND (STRING cat) (STRING each)))) (CFOR (FOR_INIT (+ 5 3)) (FOR_COND (+ |
| 49 |
6 2)) (LIST (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 3 1))) (select each (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING output))))) (LIST (COMMAND (STRING echo) (STRING asdf) (STRING 2) (REDIR > (STRING / dev / null))))) (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) (until (LIST (COMPOUND_COND (KEYWORD_TEST (a (STRING this / is . afile))))) (LIST (COMMAND (STRING touch) (STRING this / is . afile)))) (while (LIST (COMPOUND_COND (BUILTIN_TEST (n (STRING foobar))))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING file found))))) (if (LIST (COMPOUND_COND (BUILTIN_TEST (eq (STRING 5) (STRING 6))))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING something ' s wrong))))) (COMMAND (STRING echo) (STRING this) (STRING command) (STRING has) (STRING multiple) (STRING arguments)) (COMMAND (STRING wc) (PROCESS_SUBSTITUTION < (LIST (COMMAND (STRING cat) (STRING / usr / share / d |
| 50 |
ict / linux . words))))) (|| (&& (&& (&& (COMMAND (STRING cd) (STRING build)) (COMMAND (STRING . / configure))) (COMMAND (STRING make))) (COMMAND (STRING make_install))) (COMMAND (STRING echo) (STRING fail))) (COMMAND (STRING cd) (STRING / usr / bin)) (| (COMMAND (STRING ls) (STRING - al)) (COMMAND (STRING grep) (STRING more))) (VARIABLE_DEFINITIONS (= asdf (STRING parameters))) (COMMAND (STRING (VAR_REF (USE_DEFAULT_WHEN_UNSET_OR_NULL asdf (STRING foo))))) (COMMAND (STRING (VAR_REF (OFFSET asdf 8)))) (COMMAND (STRING (VAR_REF (! asdf *)))) (COMMAND (STRING (VAR_REF (! asdf @)))) (COMMAND (STRING (VAR_REF (# foo)))) (COMMAND (STRING (VAR_REF (REPLACE_FIRST replaice (STRING with) (STRING pattern))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END asdf (STRING bar))))) (COMMAND |
| 51 |
(STRING (VAR_REF 1)) (STRING (VAR_REF @)) (STRING (VAR_REF *))) (COMMAND (STRING (VAR_REF ?))) (COMMAND (STRING (VAR_REF (REPLACE_ALL PV (STRING .) (STRING _))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_START PV (STRING foo) (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_END PV (STRING foo) (STRING bar))))) (VARIABLE_DEFINITIONS (= MY_PN (STRING (VAR_REF (REPLACE_FIRST PN (STRING asterisk -)))))) (| (COMMAND (STRING cat) (STRING asdf)) (COMMAND (STRING grep) (STRING three) (STRING 2) (REDIR >& 1) (REDIR > (STRING / dev / null)))) (COMMAND (STRING echo) (STRING asdf) (REDIR >> (STRING APPEND))) (COMMAND (STRING echo) (STRING cat) (<<< (STRING word)))) |
| 52 |
+(LIST (function (STRING lots_o_echo) (CURRENT_SHELL (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING The number of tests that have failed : (VAR_REF failedtests)))) (COMMAND (STRING echo) (STRING (SINGLE_QUOTED_STRING $ failedtests))) (COMMAND (STRING echo) (STRING (VAR_REF failedtests)))))) (function (STRING do_some_arith) (CURRENT_SHELL (LIST (COMPOUND_ARITH (* 5 4)) (COMPOUND_ARITH (** 5 4)) (COMPOUND_ARITH (+ (VAR_REF (VAR_REF failedtests)) (/ 5 4))) (COMPOUND_ARITH (+ (VAR_REF (VAR_REF z)) (MINUS_SIGN 3)))))) (function (STRING arrays) (SUBSHELL (LIST (VARIABLE_DEFINITIONS (= asdf (ARRAY (STRING a) (STRING b) (STRING c) (STRING d)))) (COMMAND (STRING echo) (STRING (VAR_REF (asdf 3)))) (VARIABLE_DEFINITIONS (= foo (ARRAY (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING 6))))) (STRING b) (STRING c) (STRING d)))) (VARIABLE_DEFINITIONS (= (arr (VAR_REF foo)) (STRING 3))) (VARIABLE_DEFINITIONS (= bar (ARRAY (STRING a) (STRING b) (= 5 (STRING c |
| 53 |
)))))))) (COMMAND (STRING echo) (STRING (BRACE_EXP (STRING a) (STRING b)))) (COMMAND (STRING echo) (STRING (BRACE_EXP (.. a d)))) (COMMAND (STRING echo) (STRING (BRACE_EXP (BRACE_EXP (STRING a) (STRING b)) (STRING c) (STRING d)))) (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRING c)))) (COMMAND (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING foobar)))))) (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING gunit) (REDIR >> (STRING filelist)))) (case (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRING asdf)))) (CASE_PATTERN (STRING gz) (LIST (COMMAND (STRING echo) (STRING yay)))) (CASE_PATTERN (STRING bzip) (LIST (COMMAND (STRING echo) (STRING three)))) (CASE_PATTERN (STRING *) (LIST (COMMAND (STRING echo) (STRING woo))))) (for each (STRING (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING log)))))) (LIST (COMMAND (STRING echo) (STRING (VAR_REF each))) (COMMAND (STRING cat) (STRING each)))) (CFOR (FOR_INIT (+ 5 3)) (FOR_COND (+ |
| 54 |
6 2)) (LIST (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 3 1))) (select each (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING output))))) (LIST (COMMAND (STRING echo) (STRING asdf) (STRING 2) (REDIR > (STRING / dev / null))))) (IF_STATEMENT (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))))) (until (LIST (COMPOUND_COND (KEYWORD_TEST (a (STRING this / is . afile))))) (LIST (COMMAND (STRING touch) (STRING this / is . afile)))) (while (LIST (COMPOUND_COND (BUILTIN_TEST (n (STRING foobar))))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING file found))))) (IF_STATEMENT (if (LIST (COMPOUND_COND (BUILTIN_TEST (eq (STRING 5) (STRING 6))))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING something ' s wrong)))))) (COMMAND (STRING echo) (STRING this) (STRING command) (STRING has) (STRING multiple) (STRING arguments)) (COMMAND (STRING wc) (PROCESS_SUBSTITUTION < (LIST (COMMAND (STRING |
| 55 |
cat) (STRING / usr / share / dict / linux . words))))) (|| (&& (&& (&& (COMMAND (STRING cd) (STRING build)) (COMMAND (STRING . / configure))) (COMMAND (STRING make))) (COMMAND (STRING make_install))) (COMMAND (STRING echo) (STRING fail))) (COMMAND (STRING cd) (STRING / usr / bin)) (| (COMMAND (STRING ls) (STRING - al)) (COMMAND (STRING grep) (STRING more))) (VARIABLE_DEFINITIONS (= asdf (STRING parameters))) (COMMAND (STRING (VAR_REF (USE_DEFAULT_WHEN_UNSET_OR_NULL asdf (STRING foo))))) (COMMAND (STRING (VAR_REF (OFFSET asdf 8)))) (COMMAND (STRING (VAR_REF (! asdf *)))) (COMMAND (STRING (VAR_REF (! asdf @)))) (COMMAND (STRING (VAR_REF (# foo)))) (COMMAND (STRING (VAR_REF (REPLACE_FIRST replaice (STRING with) (STRING pattern))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END |
| 56 |
asdf (STRING bar))))) (COMMAND (STRING (VAR_REF 1)) (STRING (VAR_REF @)) (STRING (VAR_REF *))) (COMMAND (STRING (VAR_REF ?))) (COMMAND (STRING (VAR_REF (REPLACE_ALL PV (STRING .) (STRING _))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_START PV (STRING foo) (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_END PV (STRING foo) (STRING bar))))) (VARIABLE_DEFINITIONS (= MY_PN (STRING (VAR_REF (REPLACE_FIRST PN (STRING asterisk -)))))) (| (COMMAND (STRING cat) (STRING asdf)) (COMMAND (STRING grep) (STRING three) (STRING 2) (REDIR >& 1) (REDIR > (STRING / dev / null)))) (COMMAND (STRING echo) (STRING asdf) (REDIR >> (STRING APPEND))) (COMMAND (STRING echo) (STRING cat) (<<< (STRING word)))) |
| 57 |
|
| 58 |
diff --git a/bashast/gunit/compound.gunit b/bashast/gunit/compound.gunit |
| 59 |
index 3418b48..3878d55 100644 |
| 60 |
--- a/bashast/gunit/compound.gunit |
| 61 |
+++ b/bashast/gunit/compound.gunit |
| 62 |
@@ -105,15 +105,15 @@ sel_expr: |
| 63 |
if_expr: |
| 64 |
"if echo yay2; then |
| 65 |
echo yay |
| 66 |
-fi" -> (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) |
| 67 |
-"if echo yay2; then echo yay ;fi" -> (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) |
| 68 |
+fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))))) |
| 69 |
+"if echo yay2; then echo yay ;fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))))) |
| 70 |
"if echo yay2 then echo yay; fi" FAIL |
| 71 |
|
| 72 |
"if echo yay2; then |
| 73 |
echo yay |
| 74 |
elif echo yay3; then |
| 75 |
echo boo |
| 76 |
-fi" -> (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))) (if (LIST (COMMAND (STRING echo) (STRING yay3))) (LIST (COMMAND (STRING echo) (STRING boo))))) |
| 77 |
+fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) (if (LIST (COMMAND (STRING echo) (STRING yay3))) (LIST (COMMAND (STRING echo) (STRING boo))))) |
| 78 |
|
| 79 |
"if echo yay2; then |
| 80 |
echo yay |
| 81 |
@@ -121,7 +121,7 @@ elif echo yay3; then |
| 82 |
echo boo |
| 83 |
elif echo yay4; then echo hurrah |
| 84 |
else echo darn |
| 85 |
-fi" -> (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay))) (if (LIST (COMMAND (STRING echo) (STRING yay3))) (LIST (COMMAND (STRING echo) (STRING boo)))) (if (LIST (COMMAND (STRING echo) (STRING yay4))) (LIST (COMMAND (STRING echo) (STRING hurrah)))) (LIST (COMMAND (STRING echo) (STRING darn)))) |
| 86 |
+fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING echo) (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) (if (LIST (COMMAND (STRING echo) (STRING yay3))) (LIST (COMMAND (STRING echo) (STRING boo)))) (if (LIST (COMMAND (STRING echo) (STRING yay4))) (LIST (COMMAND (STRING echo) (STRING hurrah)))) (else (LIST (COMMAND (STRING echo) (STRING darn))))) |
| 87 |
|
| 88 |
while_expr: |
| 89 |
"while echo true; do |
| 90 |
|
| 91 |
diff --git a/bashast/gunit/pipeline.gunit b/bashast/gunit/pipeline.gunit |
| 92 |
index f922ca5..8101566 100644 |
| 93 |
--- a/bashast/gunit/pipeline.gunit |
| 94 |
+++ b/bashast/gunit/pipeline.gunit |
| 95 |
@@ -28,5 +28,5 @@ pipeline: |
| 96 |
"time -p cat file |grep search >> log" -> (| (COMMAND (STRING cat) (STRING file) (time -p)) (COMMAND (STRING grep) (STRING search) (REDIR >> (STRING log)))) |
| 97 |
"if time cat; then |
| 98 |
echo \"three\" |
| 99 |
-fi" -> (if (LIST (COMMAND (STRING cat) time)) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING three))))) |
| 100 |
+fi" -> (IF_STATEMENT (if (LIST (COMMAND (STRING cat) time)) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING three)))))) |
| 101 |
"i=1 j=2" -> (VARIABLE_DEFINITIONS (= i (STRING 1)) (= j (STRING 2))) |
| 102 |
|
| 103 |
diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g |
| 104 |
index 8dc0b41..bdaedf6 100644 |
| 105 |
--- a/bashast/libbashWalker.g |
| 106 |
+++ b/bashast/libbashWalker.g |
| 107 |
@@ -322,7 +322,8 @@ compound_command |
| 108 |
: ^(CURRENT_SHELL command_list) |
| 109 |
| ^(COMPOUND_COND cond_expr) |
| 110 |
| for_expr |
| 111 |
- | while_expr; |
| 112 |
+ | while_expr |
| 113 |
+ | if_expr; |
| 114 |
|
| 115 |
cond_expr |
| 116 |
:^(BUILTIN_TEST status=builtin_condition) { walker->set_status(!status); }; |
| 117 |
@@ -428,6 +429,65 @@ while_expr |
| 118 |
SEEK(INDEX() + 1); |
| 119 |
}); |
| 120 |
|
| 121 |
+if_expr |
| 122 |
+@declarations { |
| 123 |
+ bool matched = false; |
| 124 |
+} |
| 125 |
+ :^(IF_STATEMENT { |
| 126 |
+ // omit the first DOWN token |
| 127 |
+ SEEK(INDEX() + 1); |
| 128 |
+ |
| 129 |
+ while(LA(1) == IF) |
| 130 |
+ { |
| 131 |
+ if(matched) |
| 132 |
+ seek_to_next_tree(ctx); |
| 133 |
+ else |
| 134 |
+ matched = elif_expr(ctx); |
| 135 |
+ } |
| 136 |
+ |
| 137 |
+ if(LA(1) == ELSE) |
| 138 |
+ { |
| 139 |
+ if(matched == false) |
| 140 |
+ { |
| 141 |
+ // omit the ELSE DOWN tokens |
| 142 |
+ SEEK(INDEX() + 2); |
| 143 |
+ |
| 144 |
+ command_list(ctx); |
| 145 |
+ |
| 146 |
+ // omit the last UP token |
| 147 |
+ SEEK(INDEX() + 1); |
| 148 |
+ } |
| 149 |
+ else |
| 150 |
+ { |
| 151 |
+ seek_to_next_tree(ctx); |
| 152 |
+ } |
| 153 |
+ } |
| 154 |
+ |
| 155 |
+ // omit the last UP token |
| 156 |
+ SEEK(INDEX() + 1); |
| 157 |
+ }); |
| 158 |
+ |
| 159 |
+elif_expr returns[bool matched] |
| 160 |
+ :^(IF { |
| 161 |
+ // omit the first DOWN token |
| 162 |
+ SEEK(INDEX() + 1); |
| 163 |
+ |
| 164 |
+ command_list(ctx); |
| 165 |
+ if(walker->get_status() == 0) |
| 166 |
+ { |
| 167 |
+ $matched=true; |
| 168 |
+ command_list(ctx); |
| 169 |
+ } |
| 170 |
+ else |
| 171 |
+ { |
| 172 |
+ $matched=false; |
| 173 |
+ seek_to_next_tree(ctx); |
| 174 |
+ } |
| 175 |
+ |
| 176 |
+ // omit the last UP token |
| 177 |
+ SEEK(INDEX() + 1); |
| 178 |
+ }); |
| 179 |
+ |
| 180 |
command_substitution returns[std::string libbash_value] |
| 181 |
@declarations { |
| 182 |
std::stringstream out; |
| 183 |
|
| 184 |
diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash |
| 185 |
index ad00e63..d405b0d 100644 |
| 186 |
--- a/scripts/compound_command.bash |
| 187 |
+++ b/scripts/compound_command.bash |
| 188 |
@@ -46,3 +46,39 @@ until [ $i \> 0 ] |
| 189 |
do |
| 190 |
echo "Shouldn't print this" |
| 191 |
done |
| 192 |
+ |
| 193 |
+a=1 |
| 194 |
+b=2 |
| 195 |
+if [ $a == $b ] |
| 196 |
+then |
| 197 |
+ echo "Shouldn't print this" |
| 198 |
+fi |
| 199 |
+if [ $a != $b ] |
| 200 |
+then |
| 201 |
+ echo $a |
| 202 |
+fi |
| 203 |
+ |
| 204 |
+if [ $a == $b ] |
| 205 |
+then |
| 206 |
+ echo "Shouldn't print this" |
| 207 |
+elif [ $a != $b ] |
| 208 |
+then |
| 209 |
+ echo $b |
| 210 |
+fi |
| 211 |
+ |
| 212 |
+if [ $a == $b ] |
| 213 |
+then |
| 214 |
+ echo "Shouldn't print this" |
| 215 |
+else |
| 216 |
+ echo $a |
| 217 |
+fi |
| 218 |
+ |
| 219 |
+if [ $a == $b ] |
| 220 |
+then |
| 221 |
+ echo "Shouldn't print this" |
| 222 |
+elif [ $a == $b ] |
| 223 |
+then |
| 224 |
+ echo "Shouldn't print this" |
| 225 |
+else |
| 226 |
+ echo $a |
| 227 |
+fi |
| 228 |
|
| 229 |
diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result |
| 230 |
index 3e2e9f4..d760fd8 100644 |
| 231 |
--- a/scripts/compound_command.bash.result |
| 232 |
+++ b/scripts/compound_command.bash.result |
| 233 |
@@ -19,6 +19,12 @@ ghi |
| 234 |
2 |
| 235 |
3 |
| 236 |
4 |
| 237 |
+1 |
| 238 |
+2 |
| 239 |
+1 |
| 240 |
+1 |
| 241 |
+a=1 |
| 242 |
+b=2 |
| 243 |
file= foo bar |
| 244 |
foo=ghi |
| 245 |
i=4 |
Archives