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

[Petteri Räty]

commit:     ee97a0f09065b4a3117fb1312dfb8b2667015220
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Mon Mar 28 19:35:29 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 12:51:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ee97a0f0

Use function objects to simplify code

Using function objects we can make the special assignment operator
implementations share code.

---
 bashast/libbashWalker.g |   30 ++++++++++--------------------
 src/core/interpreter.h  |   10 ++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 6de281f..f7ed4ab 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -81,44 +81,34 @@ arithmetics returns[int value]
 	|^(POST_DECR libbash_name=name){ $value = walker->post_decr(libbash_name); }
 	|^(EQUALS libbash_name=name l=arithmetics) { walker->set_value(libbash_name, l); }
 	|^(MUL_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->multiply(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::multiply, libbash_name, l);
 	}
 	|^(DIVIDE_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->divide(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::divide, libbash_name, l);
 	}
 	|^(MOD_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->mod(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::mod, libbash_name, l);
 	}
 	|^(PLUS_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->plus(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::plus, libbash_name, l);
 	}
 	|^(MINUS_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->minus(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::minus, libbash_name, l);
 	}
 	|^(LSHIFT_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->left_shift(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::left_shift, libbash_name, l);
 	}
 	|^(RSHIFT_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->right_shift(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::right_shift, libbash_name, l);
 	}
 	|^(AND_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->bitwiseand(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::bitwiseand, libbash_name, l);
 	}
 	|^(XOR_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->bitwisexor(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::bitwisexor, libbash_name, l);
 	}
 	|^(OR_ASSIGN libbash_name=name l=arithmetics) {
-		walker->set_value(libbash_name,
-						  walker->bitwiseor(walker->resolve<int>(libbash_name), l));
+		walker->assign(&interpreter::bitwiseor, libbash_name, l);
 	}
 	| NUMBER { $value = walker->parse_int($NUMBER);}
 	| DIGIT { $value = walker->parse_int($DIGIT);}

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 1d6ced9..81e0837 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -29,6 +29,7 @@
 
 #include <memory>
 #include <string>
+#include <functional>
 
 #include <antlr3basetree.h>
 
@@ -289,6 +290,15 @@ public:
     return value;
   }
 
+  /// \brief assign with an operator (for example multiply)
+  /// \param a function object to do an operation while assigning
+  /// \param the name of the variable
+  /// \param the value to assign
+  void assign(std::function<int(int,int)> f, const std::string& name, int value)
+  {
+    set_value(name,f(resolve<int>(name), value));
+  }
+
   /// \brief resolve any variable
   /// \param variable name
   /// \return the value of the variable, call default constructor if