From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QF6PI-0008R3-Cx for garchives@archives.gentoo.org; Wed, 27 Apr 2011 15:12:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 742691C044; Wed, 27 Apr 2011 15:11:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 173A71C043 for ; Wed, 27 Apr 2011 15:11:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 692821B4085 for ; Wed, 27 Apr 2011 15:11:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6539C8050B for ; Wed, 27 Apr 2011 15:11:11 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <8b00cb67091edf5ae63212b9d816766714332dc7.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/, bashast/gunit/, bashast/features_script/ X-VCS-Repository: proj/libbash X-VCS-Files: bashast/bashast.g bashast/features_script/features.sh.ast bashast/gunit/compound.gunit bashast/libbashWalker.g scripts/compound_command.bash scripts/compound_command.bash.result X-VCS-Directories: scripts/ bashast/ bashast/gunit/ bashast/features_script/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 8b00cb67091edf5ae63212b9d816766714332dc7 Date: Wed, 27 Apr 2011 15:11:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: dc462ed17c7719a6e47e9dd22c71f1ac commit: 8b00cb67091edf5ae63212b9d816766714332dc7 Author: Mu Qiao gentoo org> AuthorDate: Fri Apr 22 08:53:50 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Apr 26 07:09:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D8b00cb67 Walker: support C style for loop Syntax like for((expr1; expr2; expr3)) is supported now. --- bashast/bashast.g | 3 +- bashast/features_script/features.sh.ast | 2 +- bashast/gunit/compound.gunit | 8 +++--- bashast/libbashWalker.g | 39 +++++++++++++++++++++++++= +++++- scripts/compound_command.bash | 15 ++++++++++++ scripts/compound_command.bash.result | 10 ++++++++ 6 files changed, 70 insertions(+), 7 deletions(-) diff --git a/bashast/bashast.g b/bashast/bashast.g index f6e50b3..7d44917 100644 --- a/bashast/bashast.g +++ b/bashast/bashast.g @@ -37,6 +37,7 @@ tokens{ CURRENT_SHELL; COMPOUND_ARITH; COMPOUND_COND; + CFOR; FOR_INIT; FOR_COND; FOR_MOD; @@ -186,7 +187,7 @@ compound_command //Expressions allowed inside a compound command for_expr: FOR BLANK+ name (wspace IN (BLANK+ fname)+)? semiel DO wspace*= clist semiel DONE -> ^(FOR name (fname+)? clist) | FOR BLANK* LLPAREN EOL? (BLANK* init=3Darithmetic BLANK*|BLANK+)? (SE= MIC (BLANK? fcond=3Darithmetic BLANK*|BLANK+)? SEMIC|DOUBLE_SEMIC) (BLANK= * mod=3Darithmetic)? wspace* RRPAREN semiel DO wspace clist semiel DONE - -> ^(FOR ^(FOR_INIT $init)? ^(FOR_COND $fcond)? ^(FOR_MOD $mod)? clist= ) + -> ^(CFOR ^(FOR_INIT $init)? ^(FOR_COND $fcond)? clist ^(FOR_MOD $mod)= ?) ; sel_expr: SELECT BLANK+ name (wspace IN BLANK+ word)? semiel DO wspace* = clist semiel DONE -> ^(SELECT name (word)? clist) ; diff --git a/bashast/features_script/features.sh.ast b/bashast/features_s= cript/features.sh.ast index 59e7eed..dcc435a 100644 --- a/bashast/features_script/features.sh.ast +++ b/bashast/features_script/features.sh.ast @@ -1 +1 @@ -(LIST (function (STRING lots_o_echo) (CURRENT_SHELL (LIST (COMMAND (STRI= NG echo) (STRING (DOUBLE_QUOTED_STRING The number of tests that = have failed : (VAR_REF failedtests)))) (COMMAND (STRING echo) (STRIN= G (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 (LI= ST (VARIABLE_DEFINITIONS (=3D asdf (ARRAY (STRING a) (STRING b) (STRING c= ) (STRING d)))) (COMMAND (STRING echo) (STRING (VAR_REF (asdf 3)))) (VARI= ABLE_DEFINITIONS (=3D foo (ARRAY (STRING (COMMAND_SUB (LIST (COMMAND (STR= ING echo) (STRING 6))))) (STRING b) (STRING c) (STRING d)))) (VARIABLE_DE= FINITIONS (=3D (arr (VAR_REF foo)) (STRING 3))) (VARIABLE_DEFINITIONS (=3D= bar (ARRAY (STRING a) (STRING b) (=3D 5 (STRING c )))))))) (COMMAND (STRING echo) (STRING (BRACE_EXP (STRING a) (STRING b)= ))) (COMMAND (STRING echo) (STRING (BRACE_EXP (.. a d)))) (COMMAND (STRIN= G echo) (STRING (BRACE_EXP (BRACE_EXP (STRING a) (STRING b)) (STRING c) (= STRING d)))) (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRI= NG c)))) (COMMAND (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRI= NG foobar)))))) (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING g= unit) (REDIR >> (STRING filelist)))) (case (COMMAND_SUB (LIST (COMMAND (S= TRING echo) (STRING asdf)))) (CASE_PATTERN (STRING gz) (LIST (COMMAND (ST= RING echo) (STRING yay)))) (CASE_PATTERN (STRING bzip) (LIST (COMMAND (ST= RING echo) (STRING three)))) (CASE_PATTERN (STRING *) (LIST (COMMAND (STR= ING echo) (STRING woo))))) (for each (STRING (COMMAND_SUB (LIST (| (COMMA= ND (STRING ls)) (COMMAND (STRING grep) (STRING log)))))) (LIST (COMMAND (= STRING echo) (STRING (VAR_REF each))) (COMMAND (STRING cat) (STRING each)= ))) (for (FOR_INIT (+ 5 3)) (FOR_COND (+=20 6 2)) (FOR_MOD (+ 3 1)) (LIST (COMMAND (STRING echo) (STRING yay)))) (se= lect each (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING gr= ep) (STRING output))))) (LIST (COMMAND (STRING echo) (STRING asdf) (STRIN= G 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 (CO= MMAND (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 5 6)))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUO= TED_STRING something ' s wrong))))) (COMMAND (STRING echo) (STRING this= ) (STRING command) (STRING has) (STRING multiple) (STRING arguments)) (CO= MMAND (STRING wc) (PROCESS_SUBSTITUTION < (LIST (COMMAND (STRING cat) (ST= RING / usr / share / dict / linux . words ))))) (|| (&& (&& (&& (COMMAND (STRING cd) (STRING build)) (COMMAND (STR= ING . / configure))) (COMMAND (STRING make))) (COMMAND (STRING make_insta= ll))) (COMMAND (STRING echo) (STRING fail))) (COMMAND (STRING cd) (STRING= / usr / bin)) (| (COMMAND (STRING ls) (STRING - al)) (COMMAND (STRING gr= ep) (STRING more))) (VARIABLE_DEFINITIONS (=3D asdf (STRING parameters)))= (COMMAND (STRING (VAR_REF (USE_DEFAULT_WHEN_UNSET_OR_NULL asdf (STRING f= oo))))) (COMMAND (STRING (VAR_REF (OFFSET asdf 8)))) (COMMAND (STRING (VA= R_REF (! asdf *)))) (COMMAND (STRING (VAR_REF (! asdf @)))) (COMMAND (STR= ING (VAR_REF (# foo)))) (COMMAND (STRING (VAR_REF (REPLACE_FIRST replaice= (STRING with) (STRING pattern))))) (COMMAND (STRING (VAR_REF (LAZY_REMOV= E_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_ST= ART asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END a= sdf (STRING bar))))) (COMMAND (STRING (VAR_REF (LAZY_REMOVE_AT_END 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 (=3D MY_PN (STRING (VAR_REF (REPLACE_FIRST PN= (STRING asterisk -)))))) (| (COMMAND (STRING cat) (STRING asdf)) (COMMAN= D (STRING grep) (STRING three) (STRING 2) (REDIR >& 1) (REDIR > (STRING /= dev / null)))) (COMMAND (STRING echo) (STRING asdf) (REDIR >> (STRING AP= PEND))) (COMMAND (STRING echo) (STRING cat) (<<< (STRING word)))) +(LIST (function (STRING lots_o_echo) (CURRENT_SHELL (LIST (COMMAND (STRI= NG echo) (STRING (DOUBLE_QUOTED_STRING The number of tests that = have failed : (VAR_REF failedtests)))) (COMMAND (STRING echo) (STRIN= G (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 (LI= ST (VARIABLE_DEFINITIONS (=3D asdf (ARRAY (STRING a) (STRING b) (STRING c= ) (STRING d)))) (COMMAND (STRING echo) (STRING (VAR_REF (asdf 3)))) (VARI= ABLE_DEFINITIONS (=3D foo (ARRAY (STRING (COMMAND_SUB (LIST (COMMAND (STR= ING echo) (STRING 6))))) (STRING b) (STRING c) (STRING d)))) (VARIABLE_DE= FINITIONS (=3D (arr (VAR_REF foo)) (STRING 3))) (VARIABLE_DEFINITIONS (=3D= bar (ARRAY (STRING a) (STRING b) (=3D 5 (STRING c )))))))) (COMMAND (STRING echo) (STRING (BRACE_EXP (STRING a) (STRING b)= ))) (COMMAND (STRING echo) (STRING (BRACE_EXP (.. a d)))) (COMMAND (STRIN= G echo) (STRING (BRACE_EXP (BRACE_EXP (STRING a) (STRING b)) (STRING c) (= STRING d)))) (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRI= NG c)))) (COMMAND (STRING (COMMAND_SUB (LIST (COMMAND (STRING echo) (STRI= NG foobar)))))) (| (COMMAND (STRING ls)) (COMMAND (STRING grep) (STRING g= unit) (REDIR >> (STRING filelist)))) (case (COMMAND_SUB (LIST (COMMAND (S= TRING echo) (STRING asdf)))) (CASE_PATTERN (STRING gz) (LIST (COMMAND (ST= RING echo) (STRING yay)))) (CASE_PATTERN (STRING bzip) (LIST (COMMAND (ST= RING echo) (STRING three)))) (CASE_PATTERN (STRING *) (LIST (COMMAND (STR= ING echo) (STRING woo))))) (for each (STRING (COMMAND_SUB (LIST (| (COMMA= ND (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 (+ 6 2)) (LIST (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 3 1))) (s= elect each (COMMAND_SUB (LIST (| (COMMAND (STRING ls)) (COMMAND (STRING g= rep) (STRING output))))) (LIST (COMMAND (STRING echo) (STRING asdf) (STRI= NG 2) (REDIR > (STRING / dev / null))))) (if (LIST (COMMAND (STRING echo)= (STRING yay2))) (LIST (COMMAND (STRING echo) (STRING yay)))) (until (LIS= T (COMPOUND_COND (KEYWORD_TEST (a (STRING this / is . afile))))) (LIST (C= OMMAND (STRING touch) (STRING this / is . afile)))) (while (LIST (COMPOUN= D_COND (BUILTIN_TEST (n (STRING foobar))))) (LIST (COMMAND (STRING echo) = (STRING (DOUBLE_QUOTED_STRING file found))))) (if (LIST (COMPOUND_COND = (BUILTIN_TEST (eq 5 6)))) (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QU= OTED_STRING something ' s wrong))))) (COMMAND (STRING echo) (STRING thi= s) (STRING command) (STRING has) (STRING multiple) (STRING arguments)) (C= OMMAND (STRING wc) (PROCESS_SUBSTITUTION < (LIST (COMMAND (STRING cat) (S= TRING / usr / share / dict / linux . word s))))) (|| (&& (&& (&& (COMMAND (STRING cd) (STRING build)) (COMMAND (ST= RING . / configure))) (COMMAND (STRING make))) (COMMAND (STRING make_inst= all))) (COMMAND (STRING echo) (STRING fail))) (COMMAND (STRING cd) (STRIN= G / usr / bin)) (| (COMMAND (STRING ls) (STRING - al)) (COMMAND (STRING g= rep) (STRING more))) (VARIABLE_DEFINITIONS (=3D 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 (V= AR_REF (! asdf *)))) (COMMAND (STRING (VAR_REF (! asdf @)))) (COMMAND (ST= RING (VAR_REF (# foo)))) (COMMAND (STRING (VAR_REF (REPLACE_FIRST replaic= e (STRING with) (STRING pattern))))) (COMMAND (STRING (VAR_REF (LAZY_REMO= VE_AT_START asdf (STRING bar))))) (COMMAND (STRING (VAR_REF (REPLACE_AT_S= TART 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 (STRING (VAR_REF=20 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 ba= r))))) (VARIABLE_DEFINITIONS (=3D MY_PN (STRING (VAR_REF (REPLACE_FIRST P= N (STRING asterisk -)))))) (| (COMMAND (STRING cat) (STRING asdf)) (COMMA= ND (STRING grep) (STRING three) (STRING 2) (REDIR >& 1) (REDIR > (STRING = / dev / null)))) (COMMAND (STRING echo) (STRING asdf) (REDIR >> (STRING A= PPEND))) (COMMAND (STRING echo) (STRING cat) (<<< (STRING word)))) diff --git a/bashast/gunit/compound.gunit b/bashast/gunit/compound.gunit index f999b44..3418b48 100644 --- a/bashast/gunit/compound.gunit +++ b/bashast/gunit/compound.gunit @@ -89,10 +89,10 @@ done" -> (for each (STRING (COMMAND_SUB (LIST (| (COM= MAND (STRING ls)) (COMMAND "for i in foo$var bar; do echo $i; done" -> (for i (STRING foo (VAR_REF = var)) (STRING bar) (LIST (COMMAND (STRING echo) (STRING (VAR_REF i))))) "for each in `ls |grep log`; do echo file done" FAIL =20 -"for ((5+3;5+3;5+3)); do echo yay; done" -> (for (FOR_INIT (+ 5 3)) (FOR= _COND (+ 5 3)) (FOR_MOD (+ 5 3)) (LIST (COMMAND (STRING echo) (STRING yay= )))) -"for ((5+3; ;5+3)); do echo yay; done" -> (for (FOR_INIT (+ 5 3)) (FOR_M= OD (+ 5 3)) (LIST (COMMAND (STRING echo) (STRING yay)))) -"for ((;5+3 ;5+3)); do echo yay; done" -> (for (FOR_COND (+ 5 3)) (FOR_M= OD (+ 5 3)) (LIST (COMMAND (STRING echo) (STRING yay)))) -"for ((5+3;;5+3)); do echo yay; done" -> (for (FOR_INIT (+ 5 3)) (FOR_MO= D (+ 5 3)) (LIST (COMMAND (STRING echo) (STRING yay)))) +"for ((5+3;5+3;5+3)); do echo yay; done" -> (CFOR (FOR_INIT (+ 5 3)) (FO= R_COND (+ 5 3)) (LIST (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 5= 3))) +"for ((5+3; ;5+3)); do echo yay; done" -> (CFOR (FOR_INIT (+ 5 3)) (LIST= (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 5 3))) +"for ((;5+3 ;5+3)); do echo yay; done" -> (CFOR (FOR_COND (+ 5 3)) (LIST= (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 5 3))) +"for ((5+3;;5+3)); do echo yay; done" -> (CFOR (FOR_INIT (+ 5 3)) (LIST = (COMMAND (STRING echo) (STRING yay))) (FOR_MOD (+ 5 3))) =20 =20 sel_expr: diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g index 90cf04f..eec0218 100644 --- a/bashast/libbashWalker.g +++ b/bashast/libbashWalker.g @@ -321,6 +321,8 @@ for_expr @declarations { ANTLR3_MARKER commands_index; std::vector splitted_values; + + ANTLR3_MARKER condition_index; } :^(FOR libbash_string=3Dname_base // Empty value as $@ is not supported currently @@ -341,7 +343,42 @@ for_expr walker->set_value(libbash_string, *iter); command_list(ctx); } - }); + }) + |^(CFOR { + // omit the first DOWN token for for_INIT + SEEK(INDEX() + 1); + + if(LA(1) =3D=3D FOR_INIT) + for_initilization(ctx); + + condition_index =3D INDEX(); + bool has_condition =3D (LA(1) !=3D FOR_COND); + while(has_condition || for_condition(ctx)) + { + command_list(ctx); + if(LA(1) =3D=3D FOR_MOD) + for_modification(ctx); + SEEK(condition_index); + } + + // Get out of the loop + // We are standing right after for_condition, we need to skip the comm= and_list and optional for_modification + seek_to_next_tree(ctx); + if(LA(1) =3D=3D FOR_MOD) + seek_to_next_tree(ctx); + + // omit the last UP token + SEEK(INDEX() + 1); + }); + +for_initilization + :^(FOR_INIT arithmetics); + +for_condition returns[int libbash_value] + :^(FOR_COND condition=3Darithmetics) { libbash_value =3D condition; }; + +for_modification + :^(FOR_MOD arithmetics); =20 command_substitution returns[std::string libbash_value] @declarations { diff --git a/scripts/compound_command.bash b/scripts/compound_command.bas= h index 46d965d..ad3e4f4 100644 --- a/scripts/compound_command.bash +++ b/scripts/compound_command.bash @@ -7,3 +7,18 @@ for foo in abc def ghi do echo $foo done + +for (( i=3D1; i<4; ++i )) +do + echo $i +done + +for ((;i<10;)) +do + echo $((++i)) +done + +for ((;i<0;)) +do + echo "Shouldn't print this" +done diff --git a/scripts/compound_command.bash.result b/scripts/compound_comm= and.bash.result index cfdaac2..c865c15 100644 --- a/scripts/compound_command.bash.result +++ b/scripts/compound_command.bash.result @@ -2,5 +2,15 @@ foo bar abc def ghi +1 +2 +3 +5 +6 +7 +8 +9 +10 file=3D foo bar=20 foo=3Dghi +i=3D10