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

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")

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),

include/chaiscript/language/chaiscript_eval.hpp

@@ -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 {