generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-5.x' into develop

Browse Source
This commit is contained in:
Jason Turner
2016-10-10 20:09:40 -06:00
parent aa9267726f ab07872857
commit fac8f3ec90
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/language/chaiscript_optimizer.hpp
View File

@@ -67,7 +67,7 @@ namespace chaiscript {
template<typename T> template<typename T>
auto optimize(const eval::AST_Node_Impl_Ptr<T> &p) 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()) && !p->children.empty())
{ {
auto &last_child = p->children.back(); auto &last_child = p->children.back();

5
releasenotes.md
View File

@@ -2,7 +2,7 @@ Notes:
======= =======
Current Version: 6.0.0 Current Version: 6.0.0
### Changes since 5.8.5 ### Changes since 5.8.6
*6.0.0 is a massive rework compared to 5.x. It now requires a C++14 enabled compiler* *6.0.0 is a massive rework compared to 5.x. It now requires a C++14 enabled compiler*
@@ -39,6 +39,9 @@ Current Version: 6.0.0
* File location tracking has been rewritten; this currently means error location reporting is not as good as it was * File location tracking has been rewritten; this currently means error location reporting is not as good as it was
* Tracing capability needs to be tested and vetted * Tracing capability needs to be tested and vetted
### Changes since 5.8.5
* Optimize away `return` statements in lambdas also
### Changes since 5.8.4 ### Changes since 5.8.4
* Fix order of operations for prefix operators * Fix order of operations for prefix operators
* Make sure atomics are initialized properly * Make sure atomics are initialized properly