AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2025-11-26 14:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #80

Browse Source
This commit is contained in:
yhirose 2020-01-23 17:58:43 -05:00
parent 88c67cba4f
commit da8cae6269
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
peglib.h
View File

@ -2927,13 +2927,11 @@ private:
template <typename Annotation> template <typename Annotation>
struct AstBase : public Annotation struct AstBase : public Annotation
{ {
AstBase(const char* a_path, size_t a_line, size_t a_column, AstBase(const char* a_path,
const char* a_name, size_t a_position, size_t a_length, const char* a_name, size_t a_position, size_t a_length,
size_t a_choice_count, size_t a_choice, 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)
: path(a_path ? a_path : "") : path(a_path ? a_path : "")
, line(a_line)
, column(a_column)
, name(a_name) , name(a_name)
, position(a_position) , position(a_position)
, length(a_length) , length(a_length)
@ -2948,13 +2946,11 @@ 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,
const char* a_name, size_t a_position, size_t a_length, const char* a_name, size_t a_position, size_t a_length,
size_t a_choice_count, size_t a_choice, size_t a_choice_count, size_t a_choice,
const std::string& a_token) const std::string& a_token)
: path(a_path ? a_path : "") : path(a_path ? a_path : "")
, line(a_line)
, column(a_column)
, name(a_name) , name(a_name)
, position(a_position) , position(a_position)
, length(a_length) , length(a_length)
@ -2973,8 +2969,6 @@ struct AstBase : public Annotation
size_t a_position, size_t a_length, size_t a_position, size_t a_length,
size_t a_original_choice_count, size_t a_original_choise) size_t a_original_choice_count, size_t a_original_choise)
: path(ast.path) : path(ast.path)
, line(ast.line)
, column(ast.column)
, name(ast.name) , name(ast.name)
, position(a_position) , position(a_position)
, length(a_length) , length(a_length)
@ -2992,8 +2986,6 @@ struct AstBase : public Annotation
{} {}
const std::string path; const std::string path;
const size_t line;
const size_t column;
const std::string name; const std::string name;
size_t position; size_t position;
@ -3257,17 +3249,15 @@ public:
if (!rule.action) { if (!rule.action) {
rule.action = [&](const SemanticValues& sv) { rule.action = [&](const SemanticValues& sv) {
auto line = line_info(sv.ss, sv.c_str());
if (rule.is_token()) { if (rule.is_token()) {
return std::make_shared<T>( return std::make_shared<T>(
sv.path, line.first, line.second, sv.path,
name.c_str(), std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(), sv.choice(), name.c_str(), std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(), sv.choice(),
sv.token()); sv.token());
} }
auto ast = std::make_shared<T>( auto ast = std::make_shared<T>(
sv.path, line.first, line.second, sv.path,
name.c_str(), std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(), sv.choice(), name.c_str(), std::distance(sv.ss, sv.c_str()), sv.length(), sv.choice_count(), sv.choice(),
sv.transform<std::shared_ptr<T>>()); sv.transform<std::shared_ptr<T>>());