DanilaFe/bloglang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add locations to error reporting.

Browse Source
This commit is contained in:
Danila Fedorin 2020-09-09 15:08:43 -07:00
parent 07ac3d72e4
commit 588ce99601
3 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
13/error.cpp
View File

@ -3,3 +3,26 @@
const char* type_error::what() const noexcept { const char* type_error::what() const noexcept {
return "an error occured while checking the types of the program"; return "an error occured while checking the types of the program";
} }
void type_error::pretty_print(std::ostream& to, parse_driver& drv) {
to << "encountered error while typechecking program: ";
to << description << std::endl;
if(loc) {
to << "occuring on line " << loc->begin.line << ":" << std::endl;
to << std::endl << "```" << std::endl;
drv.print_highlighted_location(to, *loc);
to << "```" << std::endl;
}
}
void unification_error::pretty_print(std::ostream& to, parse_driver& drv, type_mgr& mgr) {
type_error::pretty_print(to, drv);
to << "the expected type was:" << std::endl;
to << " \033[34m";
left->print(mgr, to);
to << std::endl << "\033[0mwhile the actual type was:" << std::endl;
to << " \033[32m";
right->print(mgr, to);
to << "\033[0m" << std::endl;
}

17
13/error.hpp
View File

@ -1,21 +1,30 @@
#pragma once #pragma once
#include <exception> #include <exception>
#include <optional>
#include "type.hpp" #include "type.hpp"
#include "location.hh"
#include "parse_driver.hpp"
using maybe_location = std::optional<yy::location>;
struct type_error : std::exception { struct type_error : std::exception {
std::string description; std::string description;
std::optional<yy::location> loc;
type_error(std::string d) type_error(std::string d, maybe_location l = std::nullopt)
: description(std::move(d)) {} : description(std::move(d)), loc(std::move(l)) {}
const char* what() const noexcept override; const char* what() const noexcept override;
void pretty_print(std::ostream& to, parse_driver& drv);
}; };
struct unification_error : public type_error { struct unification_error : public type_error {
type_ptr left; type_ptr left;
type_ptr right; type_ptr right;
unification_error(type_ptr l, type_ptr r) unification_error(type_ptr l, type_ptr r, maybe_location loc = std::nullopt)
: left(std::move(l)), right(std::move(r)), : left(std::move(l)), right(std::move(r)),
type_error("failed to unify types") {} type_error("failed to unify types", std::move(loc)) {}
void pretty_print(std::ostream& to, parse_driver& drv, type_mgr& mgr);
}; };

13
13/main.cpp
View File

@ -144,8 +144,9 @@ int main(int argc, char** argv) {
std::cout << def_defn.second->name; std::cout << def_defn.second->name;
for(auto& param : def_defn.second->params) std::cout << " " << param; for(auto& param : def_defn.second->params) std::cout << " " << param;
std::cout << ":" << std::endl; std::cout << ":" << std::endl;
def_defn.second->body->print(1, std::cout); def_defn.second->body->print(1, std::cout);
std::cout << std::endl;
} }
try { try {
typecheck_program(driver.global_defs, mgr, env); typecheck_program(driver.global_defs, mgr, env);
@ -153,14 +154,8 @@ int main(int argc, char** argv) {
scope.compile(); scope.compile();
gen_llvm(scope); gen_llvm(scope);
} catch(unification_error& err) { } catch(unification_error& err) {
std::cout << "failed to unify types: " << std::endl; err.pretty_print(std::cout, driver, mgr);
std::cout << " (1) \033[34m";
err.left->print(mgr, std::cout);
std::cout << "\033[0m" << std::endl;
std::cout << " (2) \033[32m";
err.right->print(mgr, std::cout);
std::cout << "\033[0m" << std::endl;
} catch(type_error& err) { } catch(type_error& err) {
std::cout << "failed to type check program: " << err.description << std::endl; err.pretty_print(std::cout, driver);
} }
} }