l3-ENSL/c-repl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
ala89 2023-12-26 12:34:05 +01:00
parent cd9e0a3941
commit 69276515b1
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/errors.cpp
View File

@ -7,6 +7,33 @@ using namespace std;
#include "include/colors.h"
#include "include/tokenize.h"
string UserError::get_message(void) const {
switch (this->type) {
case ErrorType::NotImplemented: return "Not implemented";
case ErrorType::UnknownToken: return "Unknown token";
case ErrorType::IntegerTooLarge: return "Integer constant is too large";
case ErrorType::EmptyInput: return "Input must not be empty";
case ErrorType::InvalidSyntax: return "Invalid syntax";
case ErrorType::ExceptedLParen: return "Expected '(";
case ErrorType::ExpectedRParen: return "Expected ')'";
case ErrorType::ExpectedRCurlyBracket: return "Expected '}'";
case ErrorType::ExpectedSemicolon: return "Expected ';'";
case ErrorType::DependentDeclaration: return "A dependant statement may not be a declaration";
case ErrorType::UnknownType: return "Unknown type '"+get<string>(this->data)+"'";
case ErrorType::TypeNotCastable: return "Can't find an explicit cast to "+get<string>(this->data)+"'";
case ErrorType::TypesNotComparable: return "Types not comparable";
case ErrorType::ExpectedIntegralType: return "Expression must have integral type";
case ErrorType::ExpectedArithmeticType: return "Expression must have arithmetic type";
case ErrorType::UnknownIdentifier: return "Unknown identifier '"+get<string>(this->data)+"'";
case ErrorType::AlreadyDeclaredIdentifier: return "Already declared identifier '"+get<string>(this->data)+"'";
case ErrorType::UninitializedIdentifier: return "Accessing uninitialized identifier '"+get<string>(this->data)+"'";
case ErrorType::DivisionByZero: return "Division by 0";
case ErrorType::ModuloByZero: return "Modulo by 0";
case ErrorType::BreakNotWithinLoop: return "Break statement not within loop";
case ErrorType::ContinueNotWithinLoop: return "Continue statement not within loop";
default: return "Unknown error type";
}
}
void print_error_position(vector<string> history, CodePosition pos) {
if (pos.column == -1 || pos.line == -1)
@ -22,32 +49,4 @@ void print_error_position(vector<string> history, CodePosition pos) {
cout << " ";
cout << BOLD RED "^--" RESET << endl;
}
string get_error_message(const UserError& e) {
switch (e.type) {
case ErrorType::NotImplemented: return "Not implemented";
case ErrorType::UnknownToken: return "Unknown token";
case ErrorType::IntegerTooLarge: return "Integer constant is too large";
case ErrorType::EmptyInput: return "Input must not be empty";
case ErrorType::InvalidSyntax: return "Invalid syntax";
case ErrorType::ExceptedLParen: return "Expected '(";
case ErrorType::ExpectedRParen: return "Expected ')'";
case ErrorType::ExpectedRCurlyBracket: return "Expected '}'";
case ErrorType::ExpectedSemicolon: return "Expected ';'";
case ErrorType::DependentDeclaration: return "A dependant statement may not be a declaration";
case ErrorType::UnknownType: return "Unknown type '"+get<string>(e.data)+"'";
case ErrorType::TypeNotCastable: return "Can't find an explicit cast to "+get<string>(e.data)+"'";
case ErrorType::TypesNotComparable: return "Types not comparable";
case ErrorType::ExpectedIntegralType: return "Expression must have integral type";
case ErrorType::ExpectedArithmeticType: return "Expression must have arithmetic type";
case ErrorType::UnknownIdentifier: return "Unknown identifier '"+get<string>(e.data)+"'";
case ErrorType::AlreadyDeclaredIdentifier: return "Already declared identifier '"+get<string>(e.data)+"'";
case ErrorType::UninitializedIdentifier: return "Accessing uninitialized identifier '"+get<string>(e.data)+"'";
case ErrorType::DivisionByZero: return "Division by 0";
case ErrorType::ModuloByZero: return "Modulo by 0";
case ErrorType::BreakNotWithinLoop: return "Break statement not within loop";
case ErrorType::ContinueNotWithinLoop: return "Continue statement not within loop";
default: return "Unknown error type";
}
}

6
src/include/errors.h
View File

@ -50,7 +50,11 @@ public:
explicit UserError(ErrorType type, CodePosition pos, ErrorData data = {})
: pos(pos), type(type), data(data) {}
const char* what() const noexcept override;
const char* what() const noexcept override {
return "User error occured.";
}
string get_message(void) const;
const CodePosition pos;
const ErrorType type;

6
src/main.cpp
View File

@ -108,15 +108,15 @@ int main(int argc, char* argv[]) {
} catch (const SyntaxError& e) {
print_error_position(input, e.pos);
cout << BOLD RED "Syntax Error: " RESET << e.what() << endl;
cout << BOLD RED "Syntax Error: " RESET << e.get_message() << endl;
} catch (const TypeError& e) {
print_error_position(input, e.pos);
cout << BOLD RED "Type Error: " RESET << e.what() << endl;
cout << BOLD RED "Type Error: " RESET << e.get_message() << endl;
} catch (const RuntimeError& e) {
print_error_position(input, e.pos);
cout << BOLD RED "Runtime Error: " RESET << e.what() << endl;
cout << BOLD RED "Runtime Error: " RESET << e.get_message() << endl;
}
cout << endl;
}

2
test/variables.cpp
View File

@ -38,7 +38,7 @@ int main() {
);
_TEST_ASSERT(
_TEST_IS_EXCEPTION(execute("int x; int x;"), ErrorType::AlreadyDefinedIdentifier),
_TEST_IS_EXCEPTION(execute("int x; int x;"), ErrorType::AlreadyDeclaredIdentifier),
"Identifieur déjà défini",
true
);