diff options
Diffstat (limited to 'lib/Parser')
| -rw-r--r-- | lib/Parser/Parser.cc | 16 | ||||
| -rw-r--r-- | lib/Parser/ParserExpression.cc | 4 | ||||
| -rw-r--r-- | lib/Parser/ParserFunction.cc | 16 |
3 files changed, 31 insertions, 5 deletions
diff --git a/lib/Parser/Parser.cc b/lib/Parser/Parser.cc index d3b2daa..a7e7edf 100644 --- a/lib/Parser/Parser.cc +++ b/lib/Parser/Parser.cc @@ -45,7 +45,7 @@ std::vector<std::unique_ptr<StmtAST>> Parser::Parse() { void Parser::syncToStatementStart() { while (CurTok != tok_eof) { switch (CurTok) { - case tok_constant: case tok_declare: case tok_identifier: case tok_input: case tok_output: + case tok_delete: case tok_constant: case tok_declare: case tok_identifier: case tok_input: case tok_output: case tok_case: case tok_endcase: case tok_otherwise: case tok_if: case tok_while: case tok_repeat: case tok_for: case tok_function: case tok_procedure: case tok_call: case tok_return: @@ -94,6 +94,20 @@ std::unique_ptr<StmtAST> Parser::ParseStatement() { } std::unique_ptr<StmtAST> Parser::ParseStatementImpl() { + if (CurTok == tok_delete) { + int Line = Lex.getLine(); + getNextToken(); + if (CurTok != tok_identifier) { + fprintf(stderr, "error: DELETE requires an object designator at line %d\n", Line); + return nullptr; + } + std::string Name = Lex.IdentifierStr; + getNextToken(); + std::vector<DesignatorAccess> Accesses; + if (!ParseDesignatorSuffix(Accesses)) return nullptr; + auto Target = std::make_unique<DesignatorExprAST>(Name, std::move(Accesses), Line); + return std::make_unique<DeleteStmtAST>(std::move(Target)); + } if (CurTok == tok_case) return ParseCaseStmt(); if (CurTok == tok_endcase || CurTok == tok_otherwise) { fprintf(stderr, "error: Unexpected CASE terminator at line %d\n", Lex.getLine()); diff --git a/lib/Parser/ParserExpression.cc b/lib/Parser/ParserExpression.cc index 96132aa..ee3e193 100644 --- a/lib/Parser/ParserExpression.cc +++ b/lib/Parser/ParserExpression.cc @@ -109,13 +109,13 @@ bool Parser::ParseDesignatorSuffix(std::vector<DesignatorAccess> &Out) { Out.push_back(std::move(A)); } else if (CurTok == '.') { getNextToken(); - if (CurTok != tok_identifier && CurTok != tok_new) { + if (CurTok != tok_identifier && CurTok != tok_new && CurTok != tok_delete) { fprintf(stderr, "error: Expected field name after '.' at line %d\n", Lex.getLine()); return false; } DesignatorAccess A; A.Kind = AccessKind::Field; - A.FieldName = CurTok == tok_new ? "NEW" : Lex.IdentifierStr; + A.FieldName = CurTok == tok_new ? "NEW" : CurTok == tok_delete ? "DELETE" : Lex.IdentifierStr; Out.push_back(std::move(A)); getNextToken(); } else if (CurTok == '^') { diff --git a/lib/Parser/ParserFunction.cc b/lib/Parser/ParserFunction.cc index 1b8b470..e4e635e 100644 --- a/lib/Parser/ParserFunction.cc +++ b/lib/Parser/ParserFunction.cc @@ -132,6 +132,10 @@ std::optional<std::vector<ParamDecl>> Parser::ParsePrototypeArgs(bool AllowByRef std::unique_ptr<FunctionDefAST> Parser::ParseFunction(const std::string &OwnerClass, bool IsPublic) { int Line = Lex.getLine(); getNextToken(); + if (CurTok == tok_delete || (CurTok == tok_identifier && sameIdentifier(Lex.IdentifierStr, "DELETE"))) { + fprintf(stderr, "error: destructor DELETE must be a PROCEDURE at line %d\n", Line); + return nullptr; + } if (CurTok == tok_new || (CurTok == tok_identifier && sameIdentifier(Lex.IdentifierStr, "NEW"))) { fprintf(stderr, "error: constructor NEW must be a PROCEDURE at line %d\n", Line); return nullptr; @@ -180,12 +184,16 @@ std::unique_ptr<FunctionDefAST> Parser::ParseFunction(const std::string &OwnerCl std::unique_ptr<FunctionDefAST> Parser::ParseProcedure(const std::string &OwnerClass, bool IsPublic) { int Line = Lex.getLine(); getNextToken(); - if (CurTok != tok_identifier && CurTok != tok_new) { + if (CurTok != tok_identifier && CurTok != tok_new && CurTok != tok_delete) { fprintf(stderr, "error: Expected procedure name\n"); return nullptr; } - std::string Name = CurTok == tok_new ? "NEW" : Lex.IdentifierStr; + std::string Name = CurTok == tok_new ? "NEW" : CurTok == tok_delete ? "DELETE" : Lex.IdentifierStr; + if (OwnerClass.empty() && sameIdentifier(Name, "DELETE")) { + fprintf(stderr, "error: destructor DELETE is only allowed in a CLASS at line %d\n", Line); + return nullptr; + } if (OwnerClass.empty() && sameIdentifier(Name, "NEW")) { fprintf(stderr, "error: constructor NEW is only allowed in a CLASS at line %d\n", Line); return nullptr; @@ -194,6 +202,10 @@ std::unique_ptr<FunctionDefAST> Parser::ParseProcedure(const std::string &OwnerC auto Args = ParsePrototypeArgs(/*AllowByRef=*/true); if (!Args) return nullptr; + if (sameIdentifier(Name, "DELETE") && !Args->empty()) { + fprintf(stderr, "error: destructor DELETE must have no parameters at line %d\n", Line); + return nullptr; + } auto Proto = std::make_unique<PrototypeAST>(Name, std::move(*Args), "VOID", false, OwnerClass, IsPublic); std::vector<std::unique_ptr<StmtAST>> Body = ParseBlock({tok_endprocedure}); |