From 1f1656a6c2bc9b2301617d56e1a27aaad8a397e6 Mon Sep 17 00:00:00 2001 From: Windoze Date: Wed, 27 Feb 2013 13:33:27 +0800 Subject: [PATCH 1/3] C++11 needs constexpr constructor when object used in constexpr expression --- include/chaiscript/dispatchkit/type_info.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp index ea4571f..466f474 100644 --- a/include/chaiscript/dispatchkit/type_info.hpp +++ b/include/chaiscript/dispatchkit/type_info.hpp @@ -28,7 +28,7 @@ namespace chaiscript class Type_Info { 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) : 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), From 88f7bffc4f3359c4772559c20844b01ab25399c7 Mon Sep 17 00:00:00 2001 From: Windoze Date: Wed, 27 Feb 2013 14:01:09 +0800 Subject: [PATCH 2/3] FreeBSD hasn't libdl, functions included in libc --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd53f9..6f3415b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,9 @@ else() endif() 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) list(APPEND LIBS "pthread") From 241ca7520422dae4edd2e7893916f0bed00244c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gro=C3=9F?= Date: Thu, 28 Feb 2013 17:39:30 +0100 Subject: [PATCH 3/3] Correct pretty_print for inline arrays. --- include/chaiscript/language/chaiscript_eval.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index 79fde89..3b7c420 100644 --- a/include/chaiscript/language/chaiscript_eval.hpp +++ b/include/chaiscript/language/chaiscript_eval.hpp @@ -1014,6 +1014,10 @@ namespace chaiscript } + virtual std::string pretty_print() const + { + return "[" + AST_Node::pretty_print() + "]"; + } }; struct Inline_Map_AST_Node : public AST_Node {