From b424d1f9cb0ef73eb41c585893c99dede8faef1f Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sun, 13 Mar 2016 15:33:23 -0600 Subject: [PATCH] delimit chaiscript text blocks --- include/chaiscript/chaiscript_stdlib.hpp | 2 +- include/chaiscript/dispatchkit/bootstrap.hpp | 4 ++-- .../{chaiscript_prelude.chai => chaiscript_prelude.hpp} | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename include/chaiscript/language/{chaiscript_prelude.chai => chaiscript_prelude.hpp} (98%) diff --git a/include/chaiscript/chaiscript_stdlib.hpp b/include/chaiscript/chaiscript_stdlib.hpp index 4b38f2c..ca0214a 100644 --- a/include/chaiscript/chaiscript_stdlib.hpp +++ b/include/chaiscript/chaiscript_stdlib.hpp @@ -18,7 +18,7 @@ #include "dispatchkit/bootstrap.hpp" #include "dispatchkit/bootstrap_stl.hpp" #include "dispatchkit/boxed_value.hpp" -#include "language/chaiscript_prelude.chai" +#include "language/chaiscript_prelude.hpp" #include "utility/json_wrap.hpp" #ifndef CHAISCRIPT_NO_THREADS diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp index 34a684f..1f519dc 100644 --- a/include/chaiscript/dispatchkit/bootstrap.hpp +++ b/include/chaiscript/dispatchkit/bootstrap.hpp @@ -453,7 +453,7 @@ namespace chaiscript m->add(fun(static_cast(&dispatch::Dynamic_Object::get_attr)), "[]"); m->add(fun(static_cast(&dispatch::Dynamic_Object::get_attr)), "[]"); - m->eval(R"chai( + m->eval(R"chaiscript( def Dynamic_Object::clone() { auto &new_o = Dynamic_Object(this.get_type_name()); for_each(this.get_attrs(), fun[new_o](x) { new_o.get_attr(x.first) = x.second; } ); @@ -488,7 +488,7 @@ namespace chaiscript return all_of(rhs_attrs, fun[lhs](x) { lhs.has_attr(x.first) && lhs.get_attr(x.first) == x.second; } ); } } - )chai"); + )chaiscript"); m->add(fun(&has_guard), "has_guard"); m->add(fun(&get_guard), "get_guard"); diff --git a/include/chaiscript/language/chaiscript_prelude.chai b/include/chaiscript/language/chaiscript_prelude.hpp similarity index 98% rename from include/chaiscript/language/chaiscript_prelude.chai rename to include/chaiscript/language/chaiscript_prelude.hpp index 934f6c4..98e0902 100644 --- a/include/chaiscript/language/chaiscript_prelude.chai +++ b/include/chaiscript/language/chaiscript_prelude.hpp @@ -1,7 +1,7 @@ // This file is distributed under the BSD License. // See "license.txt" for details. // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com) -// and Jason Turner (jason@emptycrate.com) +// and 2009-2016, Jason Turner (jason@emptycrate.com) // http://www.chaiscript.com #ifndef CHAISCRIPT_PRELUDE_HPP_ @@ -9,7 +9,7 @@ namespace chaiscript { struct ChaiScript_Prelude { - static std::string chaiscript_prelude() { return R""( + static std::string chaiscript_prelude() { return R"chaiscript( def lt(l, r) { if (call_exists(`<`, l, r)) { @@ -553,7 +553,7 @@ def find(container, value) { } -)""; +)chaiscript"; } };