Merge branch 'release-5.x' into develop

2016-10-10 20:09:40 -06:00
parent aa9267726f ab07872857
commit fac8f3ec90
2 changed files with 5 additions and 2 deletions
--- a/include/chaiscript/language/chaiscript_optimizer.hpp
+++ b/include/chaiscript/language/chaiscript_optimizer.hpp
@@ -67,7 +67,7 @@ namespace chaiscript {
      template<typename T>
      auto optimize(const eval::AST_Node_Impl_Ptr<T> &p)
      {
-        if (p->identifier == AST_Node_Type::Def
+        if ( (p->identifier == AST_Node_Type::Def || p->identifier == AST_Node_Type::Lambda)
            && !p->children.empty())
        {
          auto &last_child = p->children.back();