coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 16:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #388 from arcoRocks/patch-2

Browse Source 
Fix for #387
This commit is contained in:
Jason Turner 2018-02-02 21:34:12 -07:00 committed by GitHub
commit 1c5c34561b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/language/chaiscript_parser.hpp
View File

@ -916,7 +916,7 @@ namespace chaiscript
} break; } break;
case utility::fnv1a_32("__FUNC__"): { case utility::fnv1a_32("__FUNC__"): {
std::string fun_name = "NOT_IN_FUNCTION"; std::string fun_name = "NOT_IN_FUNCTION";
for (size_t idx = m_match_stack.size() - 1; idx > 0; --idx) for (size_t idx = m_match_stack.empty() ? 0 : m_match_stack.size() - 1; idx > 0; --idx)
{ {
if (m_match_stack[idx-1]->identifier == AST_Node_Type::Id if (m_match_stack[idx-1]->identifier == AST_Node_Type::Id
&& m_match_stack[idx-0]->identifier == AST_Node_Type::Arg_List) { && m_match_stack[idx-0]->identifier == AST_Node_Type::Arg_List) {
@ -929,7 +929,7 @@ namespace chaiscript
} break; } break;
case utility::fnv1a_32("__CLASS__"): { case utility::fnv1a_32("__CLASS__"): {
std::string fun_name = "NOT_IN_CLASS"; std::string fun_name = "NOT_IN_CLASS";
for (size_t idx = m_match_stack.size() - 1; idx > 1; --idx) for (size_t idx = m_match_stack.empty() ? 0 : m_match_stack.size() - 1; idx > 1; --idx)
{ {
if (m_match_stack[idx-2]->identifier == AST_Node_Type::Id if (m_match_stack[idx-2]->identifier == AST_Node_Type::Id
&& m_match_stack[idx-1]->identifier == AST_Node_Type::Id && m_match_stack[idx-1]->identifier == AST_Node_Type::Id