AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-11-13 22:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better error report.

Browse Source
This commit is contained in:
yhirose 2015-05-28 21:36:29 -04:00
parent a7c2de1c32
commit f3f73e5c35
6 changed files with 78 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
language/interpreter.cc
View File

@ -1,5 +1,6 @@
#include "interpreter.hpp"
#include "parser.hpp"
#include <sstream>
using namespace peglib;
using namespace std;
@ -187,19 +188,28 @@ std::ostream& operator<<(std::ostream& os, const Value& val)
return val.out(os);
}
bool run(Env& env, const char* expr, size_t len, Value& val, std::string& msg, bool print_ast)
bool run(const string& path, Env& env, const char* expr, size_t len, Value& val, std::string& msg, bool print_ast)
{
try {
shared_ptr<Ast> ast;
if (get_parser().parse_n(expr, len, ast)) {
auto& parser = get_parser();
parser.log = [&](size_t ln, size_t col, const string& err_msg) {
stringstream ss;
ss << path << ":" << ln << ":" << col << ": " << err_msg << endl;
msg = ss.str();
};
if (parser.parse_n(expr, len, ast)) {
if (print_ast) {
ast->print();
}
val = Eval::eval(*ast, env);
return true;
}
} catch (exception& e) {
}
} catch (runtime_error& e) {
msg = e.what();
}

2
language/interpreter.hpp
View File

@ -193,4 +193,4 @@ private:
std::map<std::string, Value> dic_;
};
bool run(Env& env, const char* expr, size_t len, Value& val, std::string& msg, bool print_ast);
bool run(const std::string& path, Env& env, const char* expr, size_t len, Value& val, std::string& msg, bool print_ast);

38
language/main.cc
View File

@ -44,27 +44,31 @@ int main(int argc, const char** argv)
shell = path_list.empty();
}
Env env;
env.setup_built_in_functions();
try {
Env env;
env.setup_built_in_functions();
for (auto path: path_list) {
vector<char> buff;
if (!read_file(path, buff)) {
cerr << "can't open '" << path << "'." << endl;
return -1;
for (auto path: path_list) {
vector<char> buff;
if (!read_file(path, buff)) {
cerr << "can't open '" << path << "'." << endl;
return -1;
}
Value val;
string msg;
if (!run(path, env, buff.data(), buff.size(), val, msg, print_ast)) {
cerr << msg;
return -1;
}
}
Value val;
string msg;
if (!run(env, buff.data(), buff.size(), val, msg, print_ast)) {
cerr << "error in '" << path << "'." << endl;
cerr << msg.c_str() << endl;
return -1;
if (shell) {
repl(env, print_ast);
}
}
if (shell) {
repl(env, print_ast);
} catch (exception& e) {
cerr << e.what() << endl;
return -1;
}
return 0;

65
language/parser.cc
View File

@ -40,33 +40,46 @@ static auto g_grammar = R"(
Comment <- '/*' (!'*/' .)* '*/' / ('#' / '//') (!(EndOfLine / EndOfFile) .)* (EndOfLine / EndOfFile)
)";
static auto g_parser = peg(g_grammar)
.ast_node_optimizable("STATEMENTS", Statements)
.ast_node("WHILE", While)
.ast_node("ASSIGNMENT", Assignment)
.ast_node("IF", If)
.ast_node("FUNCTION", Function)
.ast_node("PARAMETERS")
.ast_node("FUNCTION_CALL", FunctionCall)
.ast_node("ARGUMENTS")
.ast_node_optimizable("PRIMARY", Condition)
.ast_node_optimizable("CONDITION", BinExpresion)
.ast_node_optimizable("TERM", BinExpresion)
.ast_token("CONDITION_OPERATOR")
.ast_token("TERM_OPERATOR")
.ast_token("FACTOR_OPERATOR")
.ast_token("NUMBER", Number)
.ast_token("BOOLEAN", Boolean)
.ast_token("STRING")
.ast_token("IDENTIFIER", Identifier)
.ast_end()
.set_logger([&](size_t ln, size_t col, const string& msg) {
cerr << ln << ":" << col << ": " << msg << endl;
});
const peglib::peg& get_parser()
peglib::peg& get_parser()
{
return g_parser;
static peg parser;
static bool initialized = false;
if (!initialized) {
initialized = true;
parser.log = [&](size_t ln, size_t col, const string& msg) {
cerr << ln << ":" << col << ": " << msg << endl;
};
if (!parser.load_grammar(g_grammar)) {
throw logic_error("invalid peg grammar");
}
parser
.ast_node_optimizable("STATEMENTS", Statements)
.ast_node("WHILE", While)
.ast_node("ASSIGNMENT", Assignment)
.ast_node("IF", If)
.ast_node("FUNCTION", Function)
.ast_node("PARAMETERS")
.ast_node("FUNCTION_CALL", FunctionCall)
.ast_node("ARGUMENTS")
.ast_node_optimizable("PRIMARY", Condition)
.ast_node_optimizable("CONDITION", BinExpresion)
.ast_node_optimizable("TERM", BinExpresion)
.ast_token("CONDITION_OPERATOR")
.ast_token("TERM_OPERATOR")
.ast_token("FACTOR_OPERATOR")
.ast_token("NUMBER", Number)
.ast_token("BOOLEAN", Boolean)
.ast_token("STRING")
.ast_token("IDENTIFIER", Identifier)
.ast_end();
}
return parser;
}
// vim: et ts=4 sw=4 cin cino={1s ff=unix

2
language/parser.hpp
View File

@ -6,6 +6,6 @@ enum AstType
Identifier, Number, Boolean, Function
};
const peglib::peg& get_parser();
peglib::peg& get_parser();
// vim: et ts=4 sw=4 cin cino={1s ff=unix

4
language/repl.cc
View File

@ -16,11 +16,11 @@ int repl(Env& env, bool print_ast)
if (!line.empty()) {
Value val;
string msg;
if (run(env, line.c_str(), line.size(), val, msg, print_ast)) {
if (run("(repl)", env, line.c_str(), line.size(), val, msg, print_ast)) {
cout << val << endl;
linenoise::AddHistory(line.c_str());
} else if (!msg.empty()) {
cout << msg << endl;
cout << msg;
}
}
}