From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/
Date: Sun, 19 Jun 2011 19:15:35 +0000 (UTC) [thread overview]
Message-ID: <ae0cabbc1a5a36ac35b05710fb51f1098cf301e3.betelgeuse@gentoo> (raw)
commit: ae0cabbc1a5a36ac35b05710fb51f1098cf301e3
Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 08:21:34 2011 +0000
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 19:13:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ae0cabbc
Walker: support -a and -o in built-in test
---
bashast/libbashWalker.g | 16 +++++++++++++++-
scripts/test_expr.bash | 2 ++
scripts/test_expr.bash.result | 2 ++
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index f78259f..fda4ef6 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -143,6 +143,11 @@ options
return std::string(reinterpret_cast<const char *>(token->start),
boost::numeric_cast<unsigned>(token->stop - token->start + 1));
}
+
+ char get_char(pANTLR3_BASE_TREE node)
+ {
+ return *reinterpret_cast<const char *>(node->getToken(node)->start);
+ }
}
}
@@ -622,7 +627,7 @@ common_condition returns[bool status]
}
// -o for shell option, -z -n for string, -abcdefghkprstuwxOGLSN for files
|^(op=LETTER string_expr) {
- $status = internal::test_unary(*reinterpret_cast<const char *>(op->getToken(op)->start),
+ $status = internal::test_unary(get_char(op),
$string_expr.libbash_value);
}
|^(EQUALS left_str=string_expr right_str=string_expr) {
@@ -659,6 +664,15 @@ keyword_condition returns[bool status]
builtin_condition returns[bool status]
:^(NEGATION l=builtin_condition) { $status = !l; }
+ |^(BUILTIN_LOGIC o=LETTER l=builtin_condition r=builtin_condition) {
+ char op = get_char(o);
+ if(op == 'a')
+ $status = l && r;
+ else if(op == 'o')
+ $status = l || r;
+ else
+ throw libbash::interpreter_exception(std::string("unrecognized operator in built-in test: ") + op);
+ }
|s=builtin_condition_primary { $status = s; };
builtin_condition_primary returns[bool status]
diff --git a/scripts/test_expr.bash b/scripts/test_expr.bash
index f1f3093..04b5a62 100644
--- a/scripts/test_expr.bash
+++ b/scripts/test_expr.bash
@@ -50,3 +50,5 @@ i=2
unset i
[[ "setup.py" =~ ^(setup\.py|nosetests|py\.test|trial(\ .*)?)$ ]] && echo true17
[[ "setup.py" =~ ^(setup\.p|nosetests|py\.test|trial(\ .*)?)$ ]] && echo false
+[ abc = bcd -o abc = abc ] && echo true18
+[ abc = bcd -a abc = abc ] || echo true19
diff --git a/scripts/test_expr.bash.result b/scripts/test_expr.bash.result
index 2082757..fb147eb 100644
--- a/scripts/test_expr.bash.result
+++ b/scripts/test_expr.bash.result
@@ -24,3 +24,5 @@ true14
true15
true16
true17
+true18
+true19
next reply other threads:[~2011-06-19 19:15 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-19 19:15 Petteri Räty [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-19 15:23 [gentoo-commits] proj/libbash:master commit in: scripts/, bashast/ Petteri Räty
2012-08-19 14:54 Petteri Räty
2012-08-19 14:54 Petteri Räty
2012-08-19 14:29 Petteri Räty
2012-08-07 2:38 Mu Qiao
2012-08-07 2:38 Mu Qiao
2012-08-07 2:38 Mu Qiao
2012-07-29 12:46 Petteri Räty
2012-07-29 12:45 Petteri Räty
2012-07-08 9:44 Petteri Räty
2012-07-08 9:31 Petteri Räty
2012-06-03 9:08 Petteri Räty
2012-06-03 9:08 Petteri Räty
2012-06-03 9:08 Petteri Räty
2012-06-03 9:08 Petteri Räty
2012-06-03 9:08 Petteri Räty
2012-06-03 9:08 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-07-20 13:08 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-18 9:55 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-11 8:52 Petteri Räty
2011-06-11 8:52 Petteri Räty
2011-06-09 11:46 Petteri Räty
2011-06-09 8:15 Petteri Räty
2011-06-09 7:27 Petteri Räty
2011-06-03 12:43 Petteri Räty
2011-06-01 12:19 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-29 11:20 Petteri Räty
2011-05-28 13:11 Petteri Räty
2011-05-28 13:11 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-23 14:39 Petteri Räty
2011-05-22 21:00 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-11 7:19 Petteri Räty
2011-05-11 7:19 Petteri Räty
2011-05-11 7:19 Petteri Räty
2011-05-11 7:19 Petteri Räty
2011-05-06 10:29 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-20 14:04 Petteri Räty
2011-04-14 4:50 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-04 16:09 Petteri Räty
2011-04-03 13:09 Petteri Räty
2011-04-03 10:16 Petteri Räty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae0cabbc1a5a36ac35b05710fb51f1098cf301e3.betelgeuse@gentoo \
--to=betelgeuse@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox