Add output and fix two bugs.

This commit is contained in:
Danila Fedorin 2019-08-26 21:05:44 -07:00
parent 7e40af4830
commit 2dd81cf07a
7 changed files with 116 additions and 3 deletions

View File

@ -1,4 +1,5 @@
#include "ast.hpp" #include "ast.hpp"
#include <ostream>
std::string op_name(binop op) { std::string op_name(binop op) {
switch(op) { switch(op) {
@ -10,18 +11,44 @@ std::string op_name(binop op) {
throw 0; throw 0;
} }
void print_indent(int n, std::ostream& to) {
while(n--) to << " ";
}
void ast_int::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "INT: " << value << std::endl;
}
type_ptr ast_int::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_int::typecheck(type_mgr& mgr, const type_env& env) const {
return type_ptr(new type_base("Int")); return type_ptr(new type_base("Int"));
} }
void ast_lid::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "LID: " << id << std::endl;
}
type_ptr ast_lid::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_lid::typecheck(type_mgr& mgr, const type_env& env) const {
return env.lookup(id); return env.lookup(id);
} }
void ast_uid::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "UID: " << id << std::endl;
}
type_ptr ast_uid::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_uid::typecheck(type_mgr& mgr, const type_env& env) const {
return env.lookup(id); return env.lookup(id);
} }
void ast_binop::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "BINOP: " << op_name(op) << std::endl;
left->print(indent + 1, to);
right->print(indent + 1, to);
}
type_ptr ast_binop::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_binop::typecheck(type_mgr& mgr, const type_env& env) const {
type_ptr ltype = left->typecheck(mgr, env); type_ptr ltype = left->typecheck(mgr, env);
type_ptr rtype = right->typecheck(mgr, env); type_ptr rtype = right->typecheck(mgr, env);
@ -36,6 +63,13 @@ type_ptr ast_binop::typecheck(type_mgr& mgr, const type_env& env) const {
return return_type; return return_type;
} }
void ast_app::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "APP:" << std::endl;
left->print(indent + 1, to);
right->print(indent + 1, to);
}
type_ptr ast_app::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_app::typecheck(type_mgr& mgr, const type_env& env) const {
type_ptr ltype = left->typecheck(mgr, env); type_ptr ltype = left->typecheck(mgr, env);
type_ptr rtype = right->typecheck(mgr, env); type_ptr rtype = right->typecheck(mgr, env);
@ -46,6 +80,17 @@ type_ptr ast_app::typecheck(type_mgr& mgr, const type_env& env) const {
return return_type; return return_type;
} }
void ast_case::print(int indent, std::ostream& to) const {
print_indent(indent, to);
to << "CASE: " << std::endl;
for(auto& branch : branches) {
print_indent(indent + 1, to);
branch->pat->print(to);
to << std::endl;
branch->expr->print(indent + 2, to);
}
}
type_ptr ast_case::typecheck(type_mgr& mgr, const type_env& env) const { type_ptr ast_case::typecheck(type_mgr& mgr, const type_env& env) const {
type_ptr case_type = of->typecheck(mgr, env); type_ptr case_type = of->typecheck(mgr, env);
type_ptr branch_type = mgr.new_type(); type_ptr branch_type = mgr.new_type();
@ -60,10 +105,21 @@ type_ptr ast_case::typecheck(type_mgr& mgr, const type_env& env) const {
return branch_type; return branch_type;
} }
void pattern_var::print(std::ostream& to) const {
to << var;
}
void pattern_var::match(type_ptr t, type_mgr& mgr, type_env& env) const { void pattern_var::match(type_ptr t, type_mgr& mgr, type_env& env) const {
env.bind(var, t); env.bind(var, t);
} }
void pattern_constr::print(std::ostream& to) const {
to << constr;
for(auto& param : params) {
to << " " << param;
}
}
void pattern_constr::match(type_ptr t, type_mgr& mgr, type_env& env) const { void pattern_constr::match(type_ptr t, type_mgr& mgr, type_env& env) const {
type_ptr constructor_type = env.lookup(constr); type_ptr constructor_type = env.lookup(constr);
if(!constructor_type) throw 0; if(!constructor_type) throw 0;

View File

@ -7,6 +7,7 @@
struct ast { struct ast {
virtual ~ast() = default; virtual ~ast() = default;
virtual void print(int indent, std::ostream& to) const = 0;
virtual type_ptr typecheck(type_mgr& mgr, const type_env& env) const = 0; virtual type_ptr typecheck(type_mgr& mgr, const type_env& env) const = 0;
}; };
@ -15,6 +16,7 @@ using ast_ptr = std::unique_ptr<ast>;
struct pattern { struct pattern {
virtual ~pattern() = default; virtual ~pattern() = default;
virtual void print(std::ostream& to) const = 0;
virtual void match(type_ptr t, type_mgr& mgr, type_env& env) const = 0; virtual void match(type_ptr t, type_mgr& mgr, type_env& env) const = 0;
}; };
@ -62,6 +64,7 @@ struct ast_int : public ast {
explicit ast_int(int v) explicit ast_int(int v)
: value(v) {} : value(v) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -71,6 +74,7 @@ struct ast_lid : public ast {
explicit ast_lid(std::string i) explicit ast_lid(std::string i)
: id(std::move(i)) {} : id(std::move(i)) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -80,6 +84,7 @@ struct ast_uid : public ast {
explicit ast_uid(std::string i) explicit ast_uid(std::string i)
: id(std::move(i)) {} : id(std::move(i)) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -91,6 +96,7 @@ struct ast_binop : public ast {
ast_binop(binop o, ast_ptr l, ast_ptr r) ast_binop(binop o, ast_ptr l, ast_ptr r)
: op(o), left(std::move(l)), right(std::move(r)) {} : op(o), left(std::move(l)), right(std::move(r)) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -101,6 +107,7 @@ struct ast_app : public ast {
ast_app(ast_ptr l, ast_ptr r) ast_app(ast_ptr l, ast_ptr r)
: left(std::move(l)), right(std::move(r)) {} : left(std::move(l)), right(std::move(r)) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -111,6 +118,7 @@ struct ast_case : public ast {
ast_case(ast_ptr o, std::vector<branch_ptr> b) ast_case(ast_ptr o, std::vector<branch_ptr> b)
: of(std::move(o)), branches(std::move(b)) {} : of(std::move(o)), branches(std::move(b)) {}
void print(int indent, std::ostream& to) const;
type_ptr typecheck(type_mgr& mgr, const type_env& env) const; type_ptr typecheck(type_mgr& mgr, const type_env& env) const;
}; };
@ -120,6 +128,7 @@ struct pattern_var : public pattern {
pattern_var(std::string v) pattern_var(std::string v)
: var(std::move(v)) {} : var(std::move(v)) {}
void print(std::ostream &to) const;
void match(type_ptr t, type_mgr& mgr, type_env& env) const; void match(type_ptr t, type_mgr& mgr, type_env& env) const;
}; };
@ -130,6 +139,7 @@ struct pattern_constr : public pattern {
pattern_constr(std::string c, std::vector<std::string> p) pattern_constr(std::string c, std::vector<std::string> p)
: constr(std::move(c)), params(std::move(p)) {} : constr(std::move(c)), params(std::move(p)) {}
void print(std::ostream &to) const;
void match(type_ptr t, type_mgr&, type_env& env) const; void match(type_ptr t, type_mgr&, type_env& env) const;
}; };

View File

@ -34,8 +34,8 @@ void definition_data::typecheck_first(type_mgr& mgr, type_env& env) {
for(auto& constructor : constructors) { for(auto& constructor : constructors) {
type_ptr full_type = return_type; type_ptr full_type = return_type;
for(auto& type_name : constructor->types) { for(auto it = constructor->types.rbegin(); it != constructor->types.rend(); it++) {
type_ptr type = type_ptr(new type_base(type_name)); type_ptr type = type_ptr(new type_base(*it));
full_type = type_ptr(new type_arr(type, full_type)); full_type = type_ptr(new type_arr(type, full_type));
} }

View File

@ -1,6 +1,7 @@
#include "ast.hpp" #include "ast.hpp"
#include "parser.hpp" #include "parser.hpp"
#include "type.hpp" #include "type.hpp"
#include <iostream>
void yy::parser::error(const std::string& msg) { void yy::parser::error(const std::string& msg) {
std::cout << "An error occured: " << msg << std::endl; std::cout << "An error occured: " << msg << std::endl;
@ -29,11 +30,27 @@ void typecheck_program(const std::vector<definition_ptr>& prog) {
for(auto& def : prog) { for(auto& def : prog) {
def->typecheck_second(mgr, env); def->typecheck_second(mgr, env);
} }
for(auto& pair : env.names) {
std::cout << pair.first << ": ";
pair.second->print(mgr, std::cout);
std::cout << std::endl;
}
} }
int main() { int main() {
yy::parser parser; yy::parser parser;
parser.parse(); parser.parse();
for(auto& definition : program) {
definition_defn* def = dynamic_cast<definition_defn*>(definition.get());
if(!def) continue;
std::cout << def->name;
for(auto& param : def->params) std::cout << " " << param;
std::cout << ":" << std::endl;
def->body->print(1, std::cout);
}
typecheck_program(program); typecheck_program(program);
std::cout << program.size() << std::endl; std::cout << program.size() << std::endl;
} }

View File

@ -107,7 +107,7 @@ case
; ;
branches branches
: branches branch { $$ = std::move($1); $1.push_back(std::move($2)); } : branches branch { $$ = std::move($1); $$.push_back(std::move($2)); }
| branch { $$ = std::vector<branch_ptr>(); $$.push_back(std::move($1));} | branch { $$ = std::vector<branch_ptr>(); $$.push_back(std::move($1));}
; ;

View File

@ -2,6 +2,26 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
void type_var::print(const type_mgr& mgr, std::ostream& to) const {
auto it = mgr.types.find(name);
if(it != mgr.types.end()) {
it->second->print(mgr, to);
} else {
to << name;
}
}
void type_base::print(const type_mgr& mgr, std::ostream& to) const {
to << name;
}
void type_arr::print(const type_mgr& mgr, std::ostream& to) const {
left->print(mgr, to);
to << " -> (";
right->print(mgr, to);
to << ")";
}
std::string type_mgr::new_type_name() { std::string type_mgr::new_type_name() {
int temp = last_id++; int temp = last_id++;
std::string str = ""; std::string str = "";

View File

@ -2,8 +2,12 @@
#include <memory> #include <memory>
#include <map> #include <map>
struct type_mgr;
struct type { struct type {
virtual ~type() = default; virtual ~type() = default;
virtual void print(const type_mgr& mgr, std::ostream& to) const = 0;
}; };
using type_ptr = std::shared_ptr<type>; using type_ptr = std::shared_ptr<type>;
@ -13,6 +17,8 @@ struct type_var : public type {
type_var(std::string n) type_var(std::string n)
: name(std::move(n)) {} : name(std::move(n)) {}
void print(const type_mgr& mgr, std::ostream& to) const;
}; };
struct type_base : public type { struct type_base : public type {
@ -20,6 +26,8 @@ struct type_base : public type {
type_base(std::string n) type_base(std::string n)
: name(std::move(n)) {} : name(std::move(n)) {}
void print(const type_mgr& mgr, std::ostream& to) const;
}; };
struct type_arr : public type { struct type_arr : public type {
@ -28,6 +36,8 @@ struct type_arr : public type {
type_arr(type_ptr l, type_ptr r) type_arr(type_ptr l, type_ptr r)
: left(std::move(l)), right(std::move(r)) {} : left(std::move(l)), right(std::move(r)) {}
void print(const type_mgr& mgr, std::ostream& to) const;
}; };
struct type_mgr { struct type_mgr {