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

[Petteri Räty]

commit:     2a029a4cb1c33939a7ec3fe697431a72237231cd
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 07:35:03 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 10:08:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=2a029a4c

Walker: support for each loop

Syntax like "for x in blah" is supported now. Empty value used as
$@ is not supported for now. Add support for $? variable.

---
 Makefile.am                          |    2 +
 bashast/libbashWalker.g              |   58 +++++++++++++++++++++++++--------
 scripts/compound_command.bash        |    9 +++++
 scripts/compound_command.bash.result |    6 +++
 src/core/interpreter.cpp             |    4 ++-
 src/core/interpreter.h               |    9 +++++-
 utils/variable_printer.cpp           |    8 ++++-
 7 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 03848ed..0d21393 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,12 +52,14 @@ BASH_TESTS = scripts/var_def.bash \
 			 scripts/command_execution.bash \
 			 scripts/function_def.bash \
 			 scripts/arithmetic_assignment.bash \
+			 scripts/compound_command.bash \
 			 scripts/binary_arithmetic.bash
 BASH_RESULT = scripts/var_def.bash.result \
 			  scripts/var_expansion.bash.result \
 			  scripts/command_execution.bash.result \
 			  scripts/function_def.bash.result \
 			  scripts/arithmetic_assignment.bash.result \
+			  scripts/compound_command.bash.result \
 			  scripts/binary_arithmetic.bash.result
 
 TESTS = $(GUNIT_TESTS) $(BASH_TESTS)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index a3bf40d..90cf04f 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -272,7 +272,8 @@ var_ref [bool double_quoted] returns[std::string libbash_value]
 
 command
 	:variable_definitions
-	|simple_command;
+	|simple_command
+	|compound_command;
 
 simple_command
 @declarations {
@@ -280,28 +281,29 @@ simple_command
 }
 	:^(COMMAND string_expr (argument[libbash_args])* var_def*) {
 		if(walker->has_function($string_expr.libbash_value))
-			walker->call($string_expr.libbash_value,
-						 libbash_args,
-						 ctx,
-						 compound_command);
+		{
+			walker->set_status(walker->call($string_expr.libbash_value,
+											libbash_args,
+											ctx,
+											compound_command));
+		}
 		else if(cppbash_builtin::is_builtin($string_expr.libbash_value))
-			walker->execute_builtin($string_expr.libbash_value, libbash_args);
+		{
+			walker->set_status(walker->execute_builtin($string_expr.libbash_value, libbash_args));
+		}
 		else
+		{
 			std::cerr << $string_expr.libbash_value << " is not supported yet" << std::endl;
+			walker->set_status(1);
+		}
 	};
 
 argument[std::vector<std::string>& args]
 	: string_expr {
 		if($string_expr.quoted)
-		{
 			args.push_back($string_expr.libbash_value);
-		}
 		else
-		{
-			std::vector<std::string> arguments;
-			walker->split_word($string_expr.libbash_value, arguments);
-			args.insert(args.end(), arguments.begin(), arguments.end());
-		}
+			walker->split_word($string_expr.libbash_value, args);
 	};
 
 logic_command_list
@@ -311,7 +313,35 @@ logic_command_list
 
 command_list: ^(LIST logic_command_list+);
 
-compound_command: ^(CURRENT_SHELL command_list);
+compound_command
+	: ^(CURRENT_SHELL command_list)
+	| for_expr;
+
+for_expr
+@declarations {
+	ANTLR3_MARKER commands_index;
+	std::vector<std::string> splitted_values;
+}
+	:^(FOR libbash_string=name_base
+		// Empty value as $@ is not supported currently
+		(string_expr
+		{
+			// Word splitting happens here
+			if($string_expr.quoted)
+				splitted_values.push_back($string_expr.libbash_value);
+			else
+				walker->split_word($string_expr.libbash_value, splitted_values);
+		}
+		)+
+		{
+			commands_index = INDEX();
+			for(auto iter = splitted_values.begin(); iter != splitted_values.end(); ++iter)
+			{
+				SEEK(commands_index);
+				walker->set_value(libbash_string, *iter);
+				command_list(ctx);
+			}
+		});
 
 command_substitution returns[std::string libbash_value]
 @declarations {

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
new file mode 100644
index 0000000..46d965d
--- /dev/null
+++ b/scripts/compound_command.bash
@@ -0,0 +1,9 @@
+for file in " foo bar "
+do
+    echo $file
+done
+
+for foo in abc def  ghi
+do
+    echo $foo
+done

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
new file mode 100644
index 0000000..cfdaac2
--- /dev/null
+++ b/scripts/compound_command.bash.result
@@ -0,0 +1,6 @@
+foo bar
+abc
+def
+ghi
+file= foo bar 
+foo=ghi

diff --git a/src/core/interpreter.cpp b/src/core/interpreter.cpp
index 58b1495..2656e68 100644
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@ -75,7 +75,9 @@ void interpreter::split_word(const std::string& word, std::vector<std::string>&
   if(trimmed == "")
     return;
 
-  boost::split(output, trimmed, boost::is_any_of(delimeter), boost::token_compress_on);
+  std::vector<std::string> splitted_values;
+  boost::split(splitted_values, trimmed, boost::is_any_of(delimeter), boost::token_compress_on);
+  output.insert(output.end(), splitted_values.begin(), splitted_values.end());
 }
 
 inline void define_function_arguments(std::unique_ptr<scope>& current_stack,

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index af81c49..9d14f7d 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -478,6 +478,13 @@ public:
     return new_value;
   }
 
+  /// \brief set the return status of the last command
+  /// \param the value of the return status
+  void set_status(int status)
+  {
+    set_value("?", status);
+  }
+
   /// \brief define a new global variable
   /// \param the name of the variable
   /// \param the value of the variable
@@ -647,7 +654,7 @@ public:
 
   /// \brief implementation of word splitting
   /// \param the value of the word
-  //. \param[out] the splitted result
+  //. \param[out] the splitted result will be appended to output
   void split_word(const std::string& word, std::vector<std::string>& output);
 
   /// \brief perform expansion like ${var//foo/bar}

diff --git a/utils/variable_printer.cpp b/utils/variable_printer.cpp
index ed4aa69..3e31a34 100644
--- a/utils/variable_printer.cpp
+++ b/utils/variable_printer.cpp
@@ -32,6 +32,11 @@
 
 #include "libbash.h"
 
+static const std::vector<std::string> special_variables
+{
+  "IFS", "?"
+};
+
 int main(int argc, char** argv)
 {
   if(argc != 2)
@@ -45,7 +50,8 @@ int main(int argc, char** argv)
 
   std::map<std::string, std::vector<std::string>> sorted(variables.begin(), variables.end());
   // Currently we don't need internal variables
-  sorted.erase("IFS");
+  for(auto iter = special_variables.begin(); iter != special_variables.end(); ++iter)
+    sorted.erase(*iter);
 
   using namespace boost::spirit::karma;
   std::cout << format((string << '=' << -(string % ' ')) % eol, sorted) << std::endl;