AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-12-22 20:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed order of parameters in AstBase constructors

Browse Source
This commit is contained in:
yhirose 2020-05-11 21:58:30 -04:00
parent 49289420b9
commit ffbc58c103
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
peglib.h
View File

@ -3527,9 +3527,10 @@ private:
template <typename Annotation> struct AstBase : public Annotation { template <typename Annotation> struct AstBase : public Annotation {
AstBase(const char *a_path, size_t a_line, size_t a_column, AstBase(const char *a_path, size_t a_line, size_t a_column,
const char *a_name, size_t a_position, size_t a_length, const char *a_name,
size_t a_choice_count, size_t a_choice, const std::vector<std::shared_ptr<AstBase>> &a_nodes,
const std::vector<std::shared_ptr<AstBase>> &a_nodes) size_t a_position = 0, size_t a_length = 0, size_t a_choice_count = 0,
size_t a_choice = 0)
: path(a_path ? a_path : ""), line(a_line), column(a_column), : path(a_path ? a_path : ""), line(a_line), column(a_column),
name(a_name), position(a_position), length(a_length), name(a_name), position(a_position), length(a_length),
choice_count(a_choice_count), choice(a_choice), original_name(a_name), choice_count(a_choice_count), choice(a_choice), original_name(a_name),
@ -3538,8 +3539,8 @@ template <typename Annotation> struct AstBase : public Annotation {
nodes(a_nodes) {} nodes(a_nodes) {}
AstBase(const char *a_path, size_t a_line, size_t a_column, AstBase(const char *a_path, size_t a_line, size_t a_column,
const char *a_name, size_t a_position, size_t a_length, const char *a_name, const std::string &a_token, size_t a_position = 0,
size_t a_choice_count, size_t a_choice, const std::string &a_token) size_t a_length = 0, size_t a_choice_count = 0, size_t a_choice = 0)
: path(a_path ? a_path : ""), line(a_line), column(a_column), : path(a_path ? a_path : ""), line(a_line), column(a_column),
name(a_name), position(a_position), length(a_length), name(a_name), position(a_position), length(a_length),
choice_count(a_choice_count), choice(a_choice), original_name(a_name), choice_count(a_choice_count), choice(a_choice), original_name(a_name),
@ -3547,9 +3548,9 @@ template <typename Annotation> struct AstBase : public Annotation {
tag(str2tag(a_name)), original_tag(tag), is_token(true), tag(str2tag(a_name)), original_tag(tag), is_token(true),
token(a_token) {} token(a_token) {}
AstBase(const AstBase &ast, const char *a_original_name, size_t a_position, AstBase(const AstBase &ast, const char *a_original_name,
size_t a_length, size_t a_original_choice_count, size_t a_position = 0, size_t a_length = 0,
size_t a_original_choise) size_t a_original_choice_count = 0, size_t a_original_choise = 0)
: path(ast.path), line(ast.line), column(ast.column), name(ast.name), : path(ast.path), line(ast.line), column(ast.column), name(ast.name),
position(a_position), length(a_length), choice_count(ast.choice_count), position(a_position), length(a_length), choice_count(ast.choice_count),
choice(ast.choice), original_name(a_original_name), choice(ast.choice), original_name(a_original_name),
@ -3787,15 +3788,16 @@ public:
if (rule.is_token()) { if (rule.is_token()) {
return std::make_shared<T>( return std::make_shared<T>(
sv.path, line.first, line.second, name.c_str(), sv.path, line.first, line.second, name.c_str(), sv.token(),
std::distance(sv.ss, sv.c_str()), sv.length(), std::distance(sv.ss, sv.c_str()), sv.length(),
sv.choice_count(), sv.choice(), sv.token()); sv.choice_count(), sv.choice());
} }
auto ast = std::make_shared<T>( auto ast = std::make_shared<T>(
sv.path, line.first, line.second, name.c_str(), sv.path, line.first, line.second, name.c_str(),
sv.transform<std::shared_ptr<T>>(),
std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(), std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(),
sv.choice(), sv.transform<std::shared_ptr<T>>()); sv.choice());
for (auto node : ast->nodes) { for (auto node : ast->nodes) {
node->parent = ast; node->parent = ast;