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

Merge branch 'ChaiScript_5_0_CPP_11' of https://github.com/ChaiScript/ChaiScript into ChaiScript_5_0_CPP_11

Browse Source
This commit is contained in:
Jason Turner
2013-03-28 21:07:19 -06:00
parent 47e44d2f9e 6fea178f5d
commit 9d59098015
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -116,7 +116,9 @@ else()
endif() endif()
if (CMAKE_HOST_UNIX) if (CMAKE_HOST_UNIX)
list(APPEND LIBS "dl") if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
list(APPEND LIBS "dl")
endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
if (MULTITHREAD_SUPPORT_ENABLED) if (MULTITHREAD_SUPPORT_ENABLED)
list(APPEND LIBS "pthread") list(APPEND LIBS "pthread")

2
include/chaiscript/dispatchkit/type_info.hpp
View File

@@ -28,7 +28,7 @@ namespace chaiscript
class Type_Info class Type_Info
{ {
public: public:
Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void, constexpr Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void,
bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bareti) bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bareti)
: m_type_info(t_ti), m_bare_type_info(t_bareti), : m_type_info(t_ti), m_bare_type_info(t_bareti),
m_is_const(t_is_const), m_is_reference(t_is_reference), m_is_pointer(t_is_pointer), m_is_const(t_is_const), m_is_reference(t_is_reference), m_is_pointer(t_is_pointer),

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

@@ -1034,6 +1034,10 @@ namespace chaiscript
} }
virtual std::string pretty_print() const
{
return "[" + AST_Node::pretty_print() + "]";
}
}; };
struct Inline_Map_AST_Node : public AST_Node { struct Inline_Map_AST_Node : public AST_Node {