abouttreesummaryrefslogcommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/find.h4
-rw-r--r--src/main.cpp8
-rw-r--r--src/repr.h12
-rw-r--r--src/repr_get.h66
-rw-r--r--src/toc.h6
5 files changed, 53 insertions, 43 deletions
diff --git a/src/find.h b/src/find.h
index 31400ab..a969bae 100644
--- a/src/find.h
+++ b/src/find.h
@@ -78,7 +78,7 @@ opt<Variable> findVariable(
std::cout << n << std::endl;
if (namespacePrefixes.empty())
{
- return find<Variable>(p.variables, [&](Variable v) { return v.name == name; });
+ return find<Variable>(p.ctx->variables, [&](Variable v) { return v.name == name; });
}
auto n = find<Namespace>(p.namespaces, [&](Namespace n) { return n.name == namespacePrefixes[0]; });
@@ -93,7 +93,7 @@ opt<Variable> findVariable(
if (!n.has_value())
return nullopt;
}
- return find<Variable>(n.value().variables, [&](Variable v) { return v.name == name; });
+ return find<Variable>(n.value().ctx->variables, [&](Variable v) { return v.name == name; });
}
opt<Function> findStructMethod(
diff --git a/src/main.cpp b/src/main.cpp
index 19b35f3..461d014 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,7 @@
#include "toc.h"
#include "repr.h"
#include "repr_get.h"
-#include "check.h"
+//#include "check.h"
using namespace antlr4;
@@ -35,14 +35,14 @@ int main(int argc, const char * argv[])
//std::cout << "Parse Tree: " << s << std::endl;
- Program prg = getProgram(prog);
+ Program prg = getProgram(prog, nullptr);
try
{
tocProgram(std::cout, prg);
- if (!checkProgram(prg))
- std::cerr << "Error" << std::endl;
+ // if (!checkProgram(prg))
+ // std::cerr << "Error" << std::endl;
std::ofstream ofs("output.c");
tocProgram(ofs, prg);
diff --git a/src/repr.h b/src/repr.h
index f196427..fc77d92 100644
--- a/src/repr.h
+++ b/src/repr.h
@@ -37,6 +37,12 @@ struct AssignStmt;
struct ReturnStmt;
struct Stmt;
+struct Context
+{
+ std::shared_ptr<Context> parent;
+ std::vector<Variable> variables;
+};
+
enum class TypeModifierType
{
Pointer, Array
@@ -65,7 +71,7 @@ struct Variable
struct Body
{
- std::vector<Variable> variables;
+ std::shared_ptr<Context> ctx;
std::vector<Stmt> statements;
};
@@ -95,7 +101,7 @@ struct Struct
struct Namespace
{
std::string name;
- std::vector<Variable> variables;
+ std::shared_ptr<Context> ctx;
std::vector<Struct> structs;
std::vector<Function> functions;
std::vector<Namespace> namespaces;
@@ -103,7 +109,7 @@ struct Namespace
struct Program
{
- std::vector<Variable> variables;
+ std::shared_ptr<Context> ctx;
std::vector<Struct> structs;
std::vector<Function> functions;
std::vector<Namespace> namespaces;
diff --git a/src/repr_get.h b/src/repr_get.h
index 54aea6f..396c71a 100644
--- a/src/repr_get.h
+++ b/src/repr_get.h
@@ -4,11 +4,11 @@
Type getType(TocParser::TypeContext * ctx);
Variable getVariable(TocParser::VarContext * ctx);
-Body getBody(TocParser::BodyContext * ctx);
-Function getFunction(TocParser::FuncContext * ctx);
-Struct getStruct(TocParser::StructDeclContext * ctx);
-Namespace getNamespace(TocParser::NamespaceDeclContext * ctx);
-Program getProgram(TocParser::ProgContext * ctx);
+Body getBody(TocParser::BodyContext * ctx, std::shared_ptr<Context> parent);
+Function getFunction(TocParser::FuncContext * ctx, std::shared_ptr<Context> parent);
+Struct getStruct(TocParser::StructDeclContext * ctx, std::shared_ptr<Context> parent);
+Namespace getNamespace(TocParser::NamespaceDeclContext * ctx, std::shared_ptr<Context> parent);
+Program getProgram(TocParser::ProgContext * ctx, std::shared_ptr<Context> parent);
Expr getExpr(TocParser::FuncExprContext * ctx);
@@ -24,7 +24,7 @@ Expr getExpr(TocParser::BracketExprContext * ctx);
Expr getExpr(TocParser::IdentifierExprContext * ctx);
Expr getExpr(TocParser::ExprContext * ctx);
-Stmt getStmt(TocParser::StmtContext * ctx);
+Stmt getStmt(TocParser::StmtContext * ctx, std::shared_ptr<Context> parent);
Type getType(TocParser::TypeContext * ctx)
{
@@ -52,25 +52,27 @@ Variable getVariable(TocParser::VarContext * ctx)
result.type = getType(ctx->type());
return result;
}
-Body getBody(TocParser::BodyContext * ctx)
+Body getBody(TocParser::BodyContext * ctx, std::shared_ptr<Context> parent)
{
Body result;
+ result.ctx = std::make_unique<Context>();
+ result.ctx->parent = parent;
for (auto s : ctx->stmt())
{
if (s->varDecl() != nullptr)
{
- result.variables.push_back(getVariable(s->varDecl()->var()));
+ result.ctx->variables.push_back(getVariable(s->varDecl()->var()));
if (s->varDecl()->var()->expr() != nullptr)
- result.statements.push_back(getStmt(s));
+ result.statements.push_back(getStmt(s, result.ctx));
}
else
{
- result.statements.push_back(getStmt(s));
+ result.statements.push_back(getStmt(s, result.ctx));
}
}
return result;
}
-Function getFunction(TocParser::FuncContext * ctx)
+Function getFunction(TocParser::FuncContext * ctx, std::shared_ptr<Context> parent)
{
Function result;
result.name = ctx->funcName()->NAME()->toString();
@@ -80,10 +82,10 @@ Function getFunction(TocParser::FuncContext * ctx)
for (auto p : ctx->parameter()->var())
result.parameters.push_back(getVariable(p));
}
- result.body = getBody(ctx->body());
+ result.body = getBody(ctx->body(), parent);
return result;
}
-Struct getStruct(TocParser::StructDeclContext * ctx)
+Struct getStruct(TocParser::StructDeclContext * ctx, std::shared_ptr<Context> parent)
{
Struct result;
result.name = ctx->structName()->NAME()->toString();
@@ -99,58 +101,60 @@ Struct getStruct(TocParser::StructDeclContext * ctx)
if (m->structMethod() != nullptr)
{
result.methods.push_back({
- getFunction(m->structMethod()->func()),
+ getFunction(m->structMethod()->func(), parent),
m->privateDecl() != nullptr
});
}
}
return result;
}
-Namespace getNamespace(TocParser::NamespaceDeclContext * ctx)
+Namespace getNamespace(TocParser::NamespaceDeclContext * ctx, std::shared_ptr<Context> parent)
{
Namespace result;
+ result.ctx = std::make_unique<Context>();
result.name = ctx->typeName()->getText();
for (auto d : ctx->decl())
{
if (d->varDecl() != nullptr)
{
- result.variables.push_back(getVariable(d->varDecl()->var()));
+ result.ctx->variables.push_back(getVariable(d->varDecl()->var()));
}
if (d->funcDecl() != nullptr)
{
- result.functions.push_back(getFunction(d->funcDecl()->func()));
+ result.functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
}
if (d->structDecl() != nullptr)
{
- result.structs.push_back(getStruct(d->structDecl()));
+ result.structs.push_back(getStruct(d->structDecl(), result.ctx));
}
if (d->namespaceDecl() != nullptr)
{
- result.namespaces.push_back(getNamespace(d->namespaceDecl()));
+ result.namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
}
}
return result;
}
-Program getProgram(TocParser::ProgContext * ctx)
+Program getProgram(TocParser::ProgContext * ctx, std::shared_ptr<Context> parent)
{
Program result;
+ result.ctx = std::make_unique<Context>();
for (auto d : ctx->decl())
{
if (d->varDecl() != nullptr)
{
- result.variables.push_back(getVariable(d->varDecl()->var()));
+ result.ctx->variables.push_back(getVariable(d->varDecl()->var()));
}
if (d->funcDecl() != nullptr)
{
- result.functions.push_back(getFunction(d->funcDecl()->func()));
+ result.functions.push_back(getFunction(d->funcDecl()->func(), result.ctx));
}
if (d->structDecl() != nullptr)
{
- result.structs.push_back(getStruct(d->structDecl()));
+ result.structs.push_back(getStruct(d->structDecl(), result.ctx));
}
if (d->namespaceDecl() != nullptr)
{
- result.namespaces.push_back(getNamespace(d->namespaceDecl()));
+ result.namespaces.push_back(getNamespace(d->namespaceDecl(), result.ctx));
}
}
return result;
@@ -337,7 +341,7 @@ Expr getExpr(TocParser::ExprContext * ctx)
result = getExpr(dynamic_cast<TocParser::IdentifierExprContext *>(ctx));
return result;
}
-Stmt getStmt(TocParser::StmtContext * ctx)
+Stmt getStmt(TocParser::StmtContext * ctx, std::shared_ptr<Context> parent)
{
Stmt result;
if (ctx->varDecl() != nullptr && ctx->varDecl()->var()->expr() != nullptr)
@@ -351,13 +355,13 @@ Stmt getStmt(TocParser::StmtContext * ctx)
{
result.type = StmtType::If;
result._if.condition = getExpr(ctx->ifStmt()->expr());
- result._if.body = getBody(ctx->ifStmt()->body());
+ result._if.body = getBody(ctx->ifStmt()->body(), parent);
for (auto ei : ctx->ifStmt()->elseIfStmt())
{
result._if.elses.emplace_back(
true,
std::make_unique<Expr>(getExpr(ei->expr())),
- getBody(ei->body())
+ getBody(ei->body(), parent)
);
}
if (ctx->ifStmt()->elseStmt() != nullptr)
@@ -365,7 +369,7 @@ Stmt getStmt(TocParser::StmtContext * ctx)
result._if.elses.emplace_back(
false,
nullptr,
- getBody(ctx->ifStmt()->elseStmt()->body())
+ getBody(ctx->ifStmt()->elseStmt()->body(), parent)
);
}
}
@@ -377,7 +381,7 @@ Stmt getStmt(TocParser::StmtContext * ctx)
{
result._switch.cases.emplace_back(
std::make_unique<Expr>(getExpr(c->expr())),
- getBody(c->body())
+ getBody(c->body(), parent)
);
}
}
@@ -390,13 +394,13 @@ Stmt getStmt(TocParser::StmtContext * ctx)
result._for.init->rexpr = getExpr(ctx->forStmt()->varInit()->expr());
result._for.condition = std::make_unique<Expr>(getExpr(ctx->forStmt()->expr(0)));
result._for.action = std::make_unique<Expr>(getExpr(ctx->forStmt()->expr(1)));
- result._for.body = getBody(ctx->forStmt()->body());
+ result._for.body = getBody(ctx->forStmt()->body(), parent);
}
if (ctx->whileStmt() != nullptr)
{
result.type = StmtType::While;
result._while.condition = getExpr(ctx->whileStmt()->expr());
- result._while.body = getBody(ctx->whileStmt()->body());
+ result._while.body = getBody(ctx->whileStmt()->body(), parent);
}
if (ctx->assignStmt() != nullptr)
{
diff --git a/src/toc.h b/src/toc.h
index 95c24d8..43ab1ba 100644
--- a/src/toc.h
+++ b/src/toc.h
@@ -96,7 +96,7 @@ std::ostream & operator<< (std::ostream & out, const Body & b)
out << "{\n";
indentation += 2;
- for (auto v : b.variables)
+ for (auto v : b.ctx->variables)
{
indent(out);
out << v << ";\n";
@@ -279,7 +279,7 @@ void tocProgram (std::ostream & out, const Program & p)
tocFunction(out, f, true);
}
- for (auto v : p.variables)
+ for (auto v : p.ctx->variables)
{
out << v << ";\n";
}
@@ -303,7 +303,7 @@ void tocNamespace (std::ostream & out, const Namespace & n, bool stub)
namespaces.push_back(n.name);
if (!stub)
{
- for (auto v : n.variables)
+ for (auto v : n.ctx->variables)
{
out << v << ";\n";
}
generated by ps-cgit (a fork of cgit), using a theme by hackitude