Remove various other boost libraries
This commit is contained in:
parent
b297162d13
commit
4522ff0732
@ -98,7 +98,9 @@ namespace chaiscript
|
|||||||
template<typename Input>
|
template<typename Input>
|
||||||
std::string to_string(Input i)
|
std::string to_string(Input i)
|
||||||
{
|
{
|
||||||
return boost::lexical_cast<std::string>(i);
|
std::stringstream ss;
|
||||||
|
ss << i;
|
||||||
|
return ss.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -109,7 +111,10 @@ namespace chaiscript
|
|||||||
template<typename Input>
|
template<typename Input>
|
||||||
Input parse_string(const std::string &i)
|
Input parse_string(const std::string &i)
|
||||||
{
|
{
|
||||||
return boost::lexical_cast<Input>(i);
|
std::stringstream ss(i);
|
||||||
|
Input t;
|
||||||
|
ss >> t;
|
||||||
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/tuple/tuple.hpp>
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#include "boxed_value.hpp"
|
#include "boxed_value.hpp"
|
||||||
#include "boxed_cast_helper.hpp"
|
#include "boxed_cast_helper.hpp"
|
||||||
#include "bad_boxed_cast.hpp"
|
#include "bad_boxed_cast.hpp"
|
||||||
#include <boost/static_assert.hpp>
|
|
||||||
|
|
||||||
namespace chaiscript
|
namespace chaiscript
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#include "boxed_number.hpp"
|
#include "boxed_number.hpp"
|
||||||
#include "type_info.hpp"
|
#include "type_info.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/function.hpp>
|
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#include "type_info.hpp"
|
#include "type_info.hpp"
|
||||||
#include "handle_return.hpp"
|
#include "handle_return.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
#include "bind_first.hpp"
|
#include "bind_first.hpp"
|
||||||
#include <boost/function_types/components.hpp>
|
#include <boost/function_types/components.hpp>
|
||||||
#include <boost/function_types/function_type.hpp>
|
#include <boost/function_types/function_type.hpp>
|
||||||
#include <boost/function_types/is_member_object_pointer.hpp>
|
|
||||||
#include <boost/function_types/is_member_function_pointer.hpp>
|
|
||||||
|
|
||||||
namespace chaiscript
|
namespace chaiscript
|
||||||
{
|
{
|
||||||
@ -103,7 +101,7 @@ namespace chaiscript
|
|||||||
template<typename T>
|
template<typename T>
|
||||||
Proxy_Function fun(T t)
|
Proxy_Function fun(T t)
|
||||||
{
|
{
|
||||||
return dispatch::detail::Fun_Helper<boost::function_types::is_member_object_pointer<T>::value, boost::function_types::is_member_function_pointer<T>::value>::go(t);
|
return dispatch::detail::Fun_Helper<std::is_member_object_pointer<T>::value, std::is_member_function_pointer<T>::value>::go(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \brief Creates a new Proxy_Function object from a free function, member function or data member and binds the first parameter of it
|
/// \brief Creates a new Proxy_Function object from a free function, member function or data member and binds the first parameter of it
|
||||||
|
@ -71,10 +71,7 @@ namespace chaiscript
|
|||||||
std::vector<AST_NodePtr> call_stack;
|
std::vector<AST_NodePtr> call_stack;
|
||||||
|
|
||||||
eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) throw() :
|
eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) throw() :
|
||||||
std::runtime_error("Error: \"" + t_why + "\" " +
|
std::runtime_error(format(t_why, t_where, t_fname)),
|
||||||
(t_fname != "__EVAL__" ? ("in '" + t_fname + "' ") : "during evaluation ") +
|
|
||||||
+ "at (" + boost::lexical_cast<std::string>(t_where.line) + ", " +
|
|
||||||
boost::lexical_cast<std::string>(t_where.column) + ")"),
|
|
||||||
reason(t_why), start_position(t_where), end_position(t_where), filename(t_fname)
|
reason(t_why), start_position(t_where), end_position(t_where), filename(t_fname)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
@ -84,6 +81,17 @@ namespace chaiscript
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
virtual ~eval_error() throw() {}
|
virtual ~eval_error() throw() {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static std::string format(const std::string &t_why, const File_Position &t_where, const std::string &t_fname)
|
||||||
|
{
|
||||||
|
std::stringstream ss;
|
||||||
|
ss << "Error: \"" << t_why << "\" " <<
|
||||||
|
(t_fname != "__EVAL__" ? ("in '" + t_fname + "' ") : "during evaluation ") <<
|
||||||
|
"at (" << t_where.line << ", " <<
|
||||||
|
t_where.column + ")";
|
||||||
|
return ss.str();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user