pnx/m16vm
1
0
Fork 0
mirror of https://github.com/pnx/m16vm synced 2026-06-16 03:44:55 +02:00
Code Releases Activity

src/as/parser.c: on parsing error. skip doing semantics checks and code gen.

Browse source
This commit is contained in:
Henrik Hautakoski 2018-12-10 23:03:30 +01:00
parent 0916f8bcdc
commit 0f10c9fd38
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/as/parser.c
View file

@ -52,7 +52,7 @@ static int match_operand(struct lexer* lex, enum token_type type, struct ast *as
ast_instr_operand(ast, DATATYPE_STRING, lex->token.value.s); ast_instr_operand(ast, DATATYPE_STRING, lex->token.value.s);
} }
return 0; return 1;
} }
/* /*
@ -86,7 +86,7 @@ static int match_typeR(struct lexer* lex, struct ast *ast) {
match_reg(3, ast); match_reg(3, ast);
match_end; match_end;
return 0; return 1;
} }
// RI-Type (rs : u8, r0 : u8, offset : s8) // RI-Type (rs : u8, r0 : u8, offset : s8)
@ -144,7 +144,7 @@ static int parse_line(struct lexer* lex, struct ast *ast) {
// Opcode should come first. // Opcode should come first.
switch(lex->token.type) { switch(lex->token.type) {
case TOKEN_EOI: return -1; case TOKEN_EOI: return 0;
case TOKEN_EOL: break; case TOKEN_EOL: break;
case TOKEN_OPCODE_NOOP : ast_instr(ast, OP_NOOP); case TOKEN_OPCODE_NOOP : ast_instr(ast, OP_NOOP);
match_end; match_end;
@ -172,7 +172,7 @@ static int parse_line(struct lexer* lex, struct ast *ast) {
return asm_error(lex->lineno, "Opcode or label expected"); return asm_error(lex->lineno, "Opcode or label expected");
} }
return 0; return 1;
} }
// Check the semantics of the program's AST. // Check the semantics of the program's AST.
@ -203,7 +203,6 @@ static int check_semantics(struct ast* ast) {
*/ */
int parse(FILE *source_fd, FILE *dest_fd) { int parse(FILE *source_fd, FILE *dest_fd) {
int rc;
struct lexer lex; struct lexer lex;
struct ast ast; struct ast ast;
@ -211,9 +210,13 @@ int parse(FILE *source_fd, FILE *dest_fd) {
lexer_init(&lex, source_fd); lexer_init(&lex, source_fd);
// Parse and build AST. // Parse and build AST.
do { for(;;) {
rc = parse_line(&lex, &ast); int rc = parse_line(&lex, &ast);
} while(rc >= 0); if (rc < 0)
goto done;
if (rc == 0)
break;
}
if (check_semantics(&ast) < 0) if (check_semantics(&ast) < 0)
goto done; goto done;