roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-parser: refactor: xtract exprstatestack from parser

Browse source
This commit is contained in:
Roland Conybeare 2024-08-01 10:32:23 +10:00
commit a5bd857efd
2 changed files with 76 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
include/xo/parser/parser.hpp
View file

@ -282,6 +282,45 @@ namespace xo {
return os;
}
/** @class exprstatestack
* @brief A stack of exprstate objects
**/
class exprstatestack {
public:
exprstatestack() {}
bool empty() const { return stack_.empty(); }
std::size_t size() const { return stack_.size(); }
exprstate & top_exprstate();
void push_exprstate(const exprstate & exs);
void pop_exprstate();
/** relative to top-of-stack.
* 0 -> top (last in), z-1 -> bottom (first in)
**/
exprstate & operator[](std::size_t i) {
std::size_t z = stack_.size();
assert(i < z);
return stack_[z - i - 1];
}
const exprstate & operator[](std::size_t i) const {
std::size_t z = stack_.size();
assert(i < z);
return stack_[z - i - 1];
}
void print (std::ostream & os) const;
private:
std::vector<exprstate> stack_;
};
/** schematica parser
*
* Examples:
@ -400,17 +439,17 @@ namespace xo {
parser() = default;
/** for diagnostics: number of entries in parser stack **/
std::size_t stack_size() const { return stack_.size(); }
std::size_t stack_size() const { return xs_stack_.size(); }
/** for diagnostics: exprstatetype at level @p i
* (taken relative to top of stack)
*
* @pre 0 <= i < stack_size
**/
exprstatetype i_exstype(std::size_t i) const {
std::size_t z = stack_.size();
std::size_t z = xs_stack_.size();
if (i < z) {
return stack_[(z - 1) - i].exs_type();
return xs_stack_[i].exs_type();
}
/* out of bounds */
@ -433,11 +472,6 @@ namespace xo {
/** print human-readable representation on stream @p os **/
void print(std::ostream & os) const;
private:
exprstate & top_exprstate();
void push_exprstate(const exprstate & exs);
void pop_exprstate();
private:
/** state recording state associated with enclosing expressions.
*
@ -448,7 +482,7 @@ namespace xo {
* - bottom of stack is stack_[0]
* - top of stack is stack_[N-1]
**/
std::vector<exprstate> stack_;
exprstatestack xs_stack_;
}; /*parser*/