| 1 |
commit: 74f857d116fa51adaa22f78893d7f1e836a2346c |
| 2 |
Author: Petteri Räty <petsku <AT> petteriraty <DOT> eu> |
| 3 |
AuthorDate: Wed Apr 27 15:07:13 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 15:07:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=74f857d1 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'mu/compound_expr' |
| 9 |
|
| 10 |
|
| 11 |
Makefile.am | 4 + |
| 12 |
bashast/bashast.g | 25 ++-- |
| 13 |
bashast/features_script/features.sh.ast | 2 +- |
| 14 |
bashast/gunit/compound.gunit | 34 ++-- |
| 15 |
bashast/gunit/cond_main.gunit | 5 +- |
| 16 |
bashast/gunit/expansions.gunit | 3 +- |
| 17 |
bashast/gunit/pipeline.gunit | 2 +- |
| 18 |
bashast/libbashWalker.g | 286 +++++++++++++++++++++++++++---- |
| 19 |
scripts/compound_command.bash | 112 ++++++++++++ |
| 20 |
scripts/compound_command.bash.result | 34 ++++ |
| 21 |
scripts/test_expr.bash | 26 +++ |
| 22 |
scripts/test_expr.bash.result | 9 + |
| 23 |
scripts/var_def.bash | 6 + |
| 24 |
scripts/var_def.bash.result | 6 + |
| 25 |
src/core/interpreter.cpp | 10 +- |
| 26 |
src/core/interpreter.h | 17 ++- |
| 27 |
src/core/tests/interpreter_test.cpp | 14 ++ |
| 28 |
test/script_compiler.sh | 2 +- |
| 29 |
utils/variable_printer.cpp | 8 +- |
| 30 |
19 files changed, 533 insertions(+), 72 deletions(-) |
| 31 |
|
| 32 |
diff --cc Makefile.am |
| 33 |
index b4f6488,a21b3ad..7202cef |
| 34 |
--- a/Makefile.am |
| 35 |
+++ b/Makefile.am |
| 36 |
@@@ -58,13 -60,11 +60,15 @@@ BASH_RESULT = scripts/var_def.bash.resu |
| 37 |
scripts/command_execution.bash.result \ |
| 38 |
scripts/function_def.bash.result \ |
| 39 |
scripts/arithmetic_assignment.bash.result \ |
| 40 |
+ scripts/compound_command.bash.result \ |
| 41 |
+ scripts/test_expr.bash.result \ |
| 42 |
scripts/binary_arithmetic.bash.result |
| 43 |
|
| 44 |
-TESTS = $(GUNIT_TESTS) $(BASH_TESTS) |
| 45 |
+EBUILD_LOG_COMPILER = $(srcdir)/test/ebuild_compiler.sh |
| 46 |
+EBUILD_TESTS = scripts/sunpinyin-2.0.3-r1.ebuild |
| 47 |
+EBUILD_RESULT = scripts/sunpinyin-2.0.3-r1.ebuild.result |
| 48 |
+ |
| 49 |
+TESTS = $(GUNIT_TESTS) $(BASH_TESTS) $(EBUILD_TESTS) |
| 50 |
# these get cleaned so only add autogenerated stuff or modify CLEANFILES |
| 51 |
check_JAVA = bashast/bashastLexer.java bashast/bashastParser.java |
| 52 |
AM_JAVACFLAGS = -classpath @antlr_cp@ |
Archives