Merge branch 'return_value_handling' into develop

2015-04-10 08:20:55 -06:00
parent b489ffe3ed 1f74bfd9b3
commit a3f88b43ce
4 changed files with 56 additions and 31 deletions
--- a/include/chaiscript/language/chaiscript_eval.hpp
+++ b/include/chaiscript/language/chaiscript_eval.hpp
@@ -569,7 +569,12 @@ namespace chaiscript
                  lhs.assign(rhs);
                  return rhs;
                } else {
-                  rhs = t_ss.call_function("clone", rhs);
+                  if (!rhs.is_return_value())
+                  {
+                    rhs = t_ss.call_function("clone", rhs);
+                  } else {
+                    rhs.reset_return_value();
+                  }
                }
              }