Macintosh-SW
/
mpw-shell
mirror of https://github.com/ksherlock/mpw-shell.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean up errors a little bit.

This commit is contained in:
Kelvin Sherlock 2016-07-28 13:42:18 -04:00
parent 544f3a994c
commit ad523f258e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mpw-shell-parser.cpp
View File

@ -1,6 +1,7 @@
#include "mpw-shell.h" #include "mpw-shell.h"
#include "fdset.h" #include "fdset.h"
#include "value.h" #include "value.h"
#include "error.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -33,12 +34,12 @@ T pop(std::vector<T> &v) {
void open_error(const std::string &name) { void open_error(const std::string &name) {
std::string error = "### MPW Shell - Unable to open "; std::string error = "MPW Shell - Unable to open ";
error.push_back('"'); error.push_back('"');
error.append(name); error.append(name);
error.push_back('"'); error.push_back('"');
error.push_back('.'); error.push_back('.');
throw std::runtime_error(error); throw mpw_error(-4, error);
} }
int open(const std::string &name, int flags) { int open(const std::string &name, int flags) {
@ -119,7 +120,7 @@ void parse_tokens(std::vector<token> &&tokens, process &p) {
{ {
if (tokens.empty()) { if (tokens.empty()) {
throw std::runtime_error("### MPW Shell - Missing file name."); throw mpw_error(-4, "MPW Shell - Missing file name.");
} }
token name = pop(tokens); token name = pop(tokens);
int fd = open(name.string, flags); int fd = open(name.string, flags);
@ -224,23 +225,23 @@ void expression_parser::expect_binary_operator() {
token t = next(); token t = next();
std::string error; std::string error;
error = "### " + name; error = name;
error += " - Expected a binary operator when \""; error += " - Expected a binary operator when \"";
error += t.string; error += t.string;
error += "\" was encountered."; error += "\" was encountered.";
throw std::runtime_error(error); throw mpw_error(-5, error);
} }
void expression_parser::end_of_expression() { void expression_parser::end_of_expression() {
std::string error; std::string error;
error = "### " + name + " - Unexpected end of expression."; error = name + " - Unexpected end of expression.";
throw std::runtime_error(error); throw mpw_error(-5, error);
} }
void expression_parser::divide_by_zero() { void expression_parser::divide_by_zero() {
std::string error; std::string error;
error = "### " + name + " - Attempt to divide by zero."; error = name + " - Attempt to divide by zero.";
throw std::runtime_error(error); throw mpw_error(-5, error);
} }
@ -462,7 +463,7 @@ int32_t expression_parser::evaluate() {
value v = binary(); value v = binary();
if (!tokens.empty()) { if (!tokens.empty()) {
if (tokens.back().type == ')') if (tokens.back().type == ')')
throw std::runtime_error("### MPW Shell - Extra ) command."); throw mpw_error(-3, "MPW Shell - Extra ) command.");
throw std::runtime_error("evaluation stack error."); // ?? should be caught above. throw std::runtime_error("evaluation stack error."); // ?? should be caught above.
} }
return v.to_number(1); return v.to_number(1);