augusto
/
jackc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix segfault

This commit is contained in:
Augusto Gunsch 2021-01-09 15:31:59 -03:00
parent 5f45c58b33
commit 12dbe8b21d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/compiler-scopes.c
View File

@ -10,7 +10,7 @@ char* memsegnames[] = { "local", "static", "argument", "this" };
// Error messages
void doubledeclaration(const char* name, DEBUGINFO* d1, DEBUGINFO* d2);
void ensurenoduplicate(SCOPE* s, char* name);
void ensurenoduplicate(SCOPE* s, DEBUGINFO* d, char* name);
// Getters
VAR* getvarinvars(VAR* vars, const char* name);
@ -48,18 +48,18 @@ void invalidparent(SUBROUTCALL* call) {
exit(1);
}
void ensurenoduplicate(SCOPE* s, char* name) {
void ensurenoduplicate(SCOPE* s, DEBUGINFO* d, char* name) {
VAR* v = getvar(s, name);
if(v != NULL)
doubledeclaration(name, s->currdebug, v->debug);
doubledeclaration(name, d, v->debug);
CLASS* c = getclass(s, name);
if(c != NULL)
doubledeclaration(name, s->currdebug, c->debug);
doubledeclaration(name, d, c->debug);
SUBROUTDEC* sr = getsubroutdec(s, name);
if(sr != NULL)
doubledeclaration(name, s->currdebug, sr->debug);
doubledeclaration(name, d, sr->debug);
}
// Scope handling
@ -215,7 +215,7 @@ VAR* mkvar(char* type, char* name, bool primitive, DEBUGINFO* debug, MEMSEGMENT
}
void addvar(SCOPE* s, VAR** dest, VAR* v) {
ensurenoduplicate(s, v->name);
ensurenoduplicate(s, v->debug, v->name);
if(!v->primitive) {
CLASS* type = getclass(s, v->type);

1
compiler/compiler-scopes.h
View File

@ -22,7 +22,6 @@ typedef struct var {
typedef struct scope {
struct compiler* compiler;
DEBUGINFO* currdebug;
CLASS* currclass;
CLASS* classes;

1
compiler/compiler-statements.c
View File

@ -157,7 +157,6 @@ LINEBLOCK* compilelet(SCOPE* s, STATEMENT* st) {
}
LINEBLOCK* compilestatement(SCOPE* s, STATEMENT* st) {
s->currdebug = st->debug;
if(st->type == dostatement) return compilesubroutcall(s, st->dostatement);
if(st->type == returnstatement) return compileret(s, st);
if(st->type == ifstatement) return compileif(s, st);