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

Attempt better data layout of AST_Node

Browse Source
This commit is contained in:
Jason Turner 2015-04-28 08:56:20 -06:00
parent 86ec14c2c8
commit 8bbcceed88
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/chaiscript/language/chaiscript_common.hpp
View File

@ -406,11 +406,11 @@ namespace chaiscript
/// \brief Struct that doubles as both a parser ast_node and an AST node. /// \brief Struct that doubles as both a parser ast_node and an AST node.
struct AST_Node : std::enable_shared_from_this<AST_Node> { struct AST_Node : std::enable_shared_from_this<AST_Node> {
public: public:
const std::string text;
const int identifier; //< \todo shouldn't this be a strongly typed enum value?
std::shared_ptr<const std::string> filename;
File_Position start, end;
std::vector<AST_NodePtr> children; std::vector<AST_NodePtr> children;
const int identifier; //< \todo shouldn't this be a strongly typed enum value?
const std::string text;
File_Position start, end;
std::shared_ptr<const std::string> filename;
AST_NodePtr annotation; AST_NodePtr annotation;
virtual std::string pretty_print() const virtual std::string pretty_print() const
@ -468,13 +468,13 @@ namespace chaiscript
protected: protected:
AST_Node(std::string t_ast_node_text, int t_id, const std::shared_ptr<const std::string> &t_fname, AST_Node(std::string t_ast_node_text, int t_id, const std::shared_ptr<const std::string> &t_fname,
int t_start_line, int t_start_col, int t_end_line, int t_end_col) : int t_start_line, int t_start_col, int t_end_line, int t_end_col) :
text(std::move(t_ast_node_text)), identifier(t_id), filename(t_fname), identifier(t_id), text(std::move(t_ast_node_text)),
start(t_start_line, t_start_col), end(t_end_line, t_end_col) start(t_start_line, t_start_col), end(t_end_line, t_end_col), filename(t_fname)
{ {
} }
AST_Node(std::string t_ast_node_text, int t_id, const std::shared_ptr<const std::string> &t_fname) : AST_Node(std::string t_ast_node_text, int t_id, const std::shared_ptr<const std::string> &t_fname) :
text(std::move(t_ast_node_text)), identifier(t_id), filename(t_fname) {} identifier(t_id), text(std::move(t_ast_node_text)), filename(t_fname) {}
virtual ~AST_Node() {} virtual ~AST_Node() {}