allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

add '-' syntax for free relation

Browse Source
This commit is contained in:
David Allemang
2022-09-23 15:55:39 -04:00
parent f7bf77e5f0
commit 26e0578421
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tc/src/lang.cpp
View File

@@ -3,6 +3,7 @@
#include <string> #include <string>
#include <cassert> #include <cassert>
#include <tc/util.hpp>
#include <tc/group.hpp> #include <tc/group.hpp>
#include <tc/groups.hpp> #include <tc/groups.hpp>
@@ -17,6 +18,7 @@ struct Op {
PUSH, PUSH,
POP, POP,
LOOP, LOOP,
FREE,
}; };
Code code: 4; Code code: 4;
@@ -45,6 +47,8 @@ struct fmt::formatter<Op> {
return fmt::format_to(ctx.out(), "pop()"); return fmt::format_to(ctx.out(), "pop()");
case Op::LOOP: case Op::LOOP:
return fmt::format_to(ctx.out(), "loop()"); return fmt::format_to(ctx.out(), "loop()");
case Op::FREE:
return fmt::format_to(ctx.out(), "free()");
default: default:
return fmt::format_to(ctx.out(), "[{}]({})", return fmt::format_to(ctx.out(), "[{}]({})",
(unsigned int) op.code, (unsigned int) op.code,
@@ -77,6 +81,10 @@ struct codegen {
ops.emplace_back(Op::LOOP); ops.emplace_back(Op::LOOP);
} }
void free() {
ops.emplace_back(Op::FREE);
}
template<typename It> template<typename It>
void insert(It begin, It end) { void insert(It begin, It end) {
std::copy(begin, end, std::back_inserter(ops)); std::copy(begin, end, std::back_inserter(ops));
@@ -92,7 +100,7 @@ static const std::string GRAMMAR = R"(
term <- product / op term <- product / op
op <- block / link op <- block / link
block <- '(' root ')' / '{' root '}' / '[' root ']' block <- '(' root ')' / '{' root '}' / '[' root ']'
link <- int link <- int / '-'
product <- op '*' factor product <- op '*' factor
factor <- int / '{' int+ '}' / '[' int+ ']' factor <- int / '{' int+ '}' / '[' int+ ']'
int <- < [0-9]+ > int <- < [0-9]+ >
@@ -115,8 +123,12 @@ peg::parser build_parser() {
parser["link"] = [](const peg::SemanticValues &vs) -> std::any { parser["link"] = [](const peg::SemanticValues &vs) -> std::any {
codegen cg; codegen cg;
if (vs.choice() == 0) {
auto order = std::any_cast<unsigned int>(vs[0]); auto order = std::any_cast<unsigned int>(vs[0]);
cg.link(order); cg.link(order);
} else {
cg.free();
}
return cg; return cg;
}; };
@@ -211,7 +223,7 @@ std::vector<Op> compile(const std::string &source) {
struct Graph { struct Graph {
size_t rank{}; size_t rank{};
std::vector<std::tuple<size_t, size_t, unsigned int>> edges{}; std::vector<tc::Rel> edges{};
}; };
Graph eval(const std::vector<Op> &ops) { Graph eval(const std::vector<Op> &ops) {
@@ -222,8 +234,13 @@ Graph eval(const std::vector<Op> &ops) {
for (const auto &op: ops) { for (const auto &op: ops) {
switch (op.code) { switch (op.code) {
case Op::FREE:
case Op::LINK: { case Op::LINK: {
auto order = op.value; tc::Mult order = tc::FREE;
if (op.code == Op::LINK) {
order = op.value;
}
auto top = stacks.back().top(); auto top = stacks.back().top();
auto curr = g.rank++; auto curr = g.rank++;