diff --git a/src/parser.y b/src/parser.y index 68d9e2c12..a06db79c4 100644 --- a/src/parser.y +++ b/src/parser.y @@ -765,7 +765,7 @@ algebra: algebra_head '{' fn_defs '}' automatic_specifier: @enum@ | @count@ | - @enum_graph@ + @trees@ ; \end{lstlisting} The {\tt automatic} keyword specifies the auto generation of the diff --git a/src/signature.cc b/src/signature.cc index 773292610..da85199b2 100644 --- a/src/signature.cc +++ b/src/signature.cc @@ -149,8 +149,8 @@ Algebra *Signature::generate(std::string *n, std::string *mode) { return generate_count(n); if (*mode == "enum") return generate_enum(n); - if (*mode == "enum_graph") - return generate_enum_graph(n); + if (*mode == "trees") + return generate_trees(n); return NULL; } @@ -421,7 +421,7 @@ Algebra *Signature::generate_enum(std::string *n) { //------------------------------------------------------------------------------------------------------------ -struct Generate_Enum_Graph_Stmts : public Generate_Stmts { +struct Generate_Tree_Stmts : public Generate_Stmts { private: // closes nodes for simple tracks void apply(std::list &l, Para_Decl::Simple *s, @@ -564,9 +564,9 @@ struct Generate_Enum_Graph_Stmts : public Generate_Stmts { }; -Algebra *Signature::generate_enum_graph(std::string *n) { +Algebra *Signature::generate_trees(std::string *n) { return generate_algebra(n, Mode::PRETTY, new Type::External("Rope"), - Generate_Enum_Graph_Stmts()); + Generate_Tree_Stmts()); } diff --git a/src/signature.hh b/src/signature.hh index 2e2f1d955..a7315c00a 100644 --- a/src/signature.hh +++ b/src/signature.hh @@ -97,7 +97,7 @@ class Signature : public Signature_Base { private: Algebra *generate_count(std::string *n); Algebra *generate_enum(std::string *n); - Algebra *generate_enum_graph(std::string *n); + Algebra *generate_trees(std::string *n); Algebra *generate_algebra( std::string *n, Mode::Type mode_type, Type::Base *answer_type, Type::Base *alph, const Generate_Stmts &generate_stmts);