r4/lang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make while loops more efficient and improve expression parsing

Browse Source
This commit is contained in:
r4 2021-12-21 17:09:03 +01:00
parent 10d436107c
commit 9f339ed44d
2 changed files with 78 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example.script
View File

@ -2,7 +2,7 @@ x := 1
y := 1 y := 1
i := 60 i := 60
while i { while i + 1 {
z := x + y z := x + y
y = x y = x
x = z x = z

102
parse.c
View File

@ -17,12 +17,25 @@ typedef struct Scope {
Map ident_addrs; Map ident_addrs;
} Scope; } Scope;
typedef struct ExprMode {
bool ignore_newln;
enum {
ExprModeJustCollapse, /* should leave either a literal or an own address as result */
ExprModeStorageAddr, /* should use the supplied storage address in any case; should leave no token behind */
} kind;
union {
size_t StorageAddr;
};
} ExprMode;
static void mark_err(const Tok *t); static void mark_err(const Tok *t);
static size_t get_ident_addr(const Scope *sc, const char *name, const Tok *errpos); static size_t get_ident_addr(const Scope *sc, const char *name, const Tok *errpos);
static IRParam tok_to_irparam(Scope *sc, Tok *t); static IRParam tok_to_irparam(Scope *sc, Tok *t);
static Scope make_scope(Scope *parent, size_t mem_addr, bool with_idents); static Scope make_scope(Scope *parent, bool with_idents);
static void term_scope(Scope *sc); static void term_scope(Scope *sc);
static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool use_storage_addr, size_t storage_addr); static void expr(State *s, Scope *parent_sc, TokListItem *t, ExprMode mode);
static void stmt(State *s, Scope *sc, TokListItem *t); static void stmt(State *s, Scope *sc, TokListItem *t);
static void mark_err(const Tok *t) { static void mark_err(const Tok *t) {
@ -71,8 +84,8 @@ static IRParam tok_to_irparam(Scope *sc, Tok *t) {
} }
/* term_scope doesn't have to be called if with_idents is set to false. */ /* term_scope doesn't have to be called if with_idents is set to false. */
static Scope make_scope(Scope *parent, size_t mem_addr, bool with_idents) { static Scope make_scope(Scope *parent, bool with_idents) {
Scope s = { .parent = parent, .mem_addr = mem_addr, .has_idents = with_idents }; Scope s = { .parent = parent, .mem_addr = parent ? parent->mem_addr : 0, .has_idents = with_idents };
if (with_idents) if (with_idents)
map_init(&s.ident_addrs, sizeof(size_t)); map_init(&s.ident_addrs, sizeof(size_t));
return s; return s;
@ -83,9 +96,7 @@ static void term_scope(Scope *sc) {
map_term(&sc->ident_addrs); map_term(&sc->ident_addrs);
} }
/* If toplevel is set, newlines are seen as delimiters ending the expression. static void expr(State *s, Scope *parent_sc, TokListItem *t, ExprMode mode) {
* If use_storage_addr is set, the result is guaranteed to be put into storage_addr. */
static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool use_storage_addr, size_t storage_addr) {
/* A simplified example of how the operator precedence parsing works: /* A simplified example of how the operator precedence parsing works:
* ________________________________ * ________________________________
* Where t points to (between l_op and r_op in each step) * Where t points to (between l_op and r_op in each step)
@ -123,12 +134,9 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
*/ */
TokListItem *start = t; TokListItem *start = t;
Scope *sc = parent_sc;
Scope expr_scope_obj; /* Each expression and subexpression has its own scope. */
if (toplevel) { Scope sc = make_scope(parent_sc, false);
expr_scope_obj = make_scope(parent_sc, parent_sc->mem_addr, false);
sc = &expr_scope_obj;
}
for (;;) { for (;;) {
/* Prepare to collapse negative factor. */ /* Prepare to collapse negative factor. */
@ -138,8 +146,8 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
negate = true; negate = true;
} }
/* Ignore newlines if the expression is not toplevel. */ /* Ignore newlines if told to do so. */
if (!toplevel && t->next->tok.kind == TokOp && t->next->tok.Op == OpNewLn) if (mode.ignore_newln && t->next->tok.kind == TokOp && t->next->tok.Op == OpNewLn)
toklist_del(s->toks, t->next, t->next); toklist_del(s->toks, t->next, t->next);
/* Collapse negative factor. */ /* Collapse negative factor. */
@ -161,14 +169,14 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
} else { } else {
/* use the predefined storage address if it was requested and we're on the last operation */ /* use the predefined storage address if it was requested and we're on the last operation */
size_t res_addr; size_t res_addr;
if (use_storage_addr && is_last_operation) if (mode.kind == ExprModeStorageAddr && is_last_operation)
res_addr = storage_addr; res_addr = mode.StorageAddr;
else else
res_addr = sc->mem_addr++; res_addr = sc.mem_addr++;
/* add IR instruction to negate the value */ /* add IR instruction to negate the value */
IRParam v_irparam; IRParam v_irparam;
TRY(v_irparam = tok_to_irparam(sc, v)); TRY(v_irparam = tok_to_irparam(&sc, v));
irtoks_app(s->ir, (IRTok){ irtoks_app(s->ir, (IRTok){
.ln = t->tok.ln, .ln = t->tok.ln,
.col = t->tok.col, .col = t->tok.col,
@ -179,17 +187,18 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
}, },
}); });
if (mode.kind == ExprModeStorageAddr && is_last_operation) {
/* done */
toklist_del(s->toks, t, t);
return;
} else {
/* leave new memory address as result */ /* leave new memory address as result */
t->tok.kind = TokIdent; t->tok.kind = TokIdent;
t->tok.Ident = (Identifier){ t->tok.Ident = (Identifier){
.kind = IdentAddr, .kind = IdentAddr,
.Addr = res_addr, .Addr = res_addr,
}; };
}
if (use_storage_addr && is_last_operation)
/* Since the final result was written to the storage address,
* we're done. */
return;
} }
} }
@ -226,18 +235,20 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
set_err("Expected literal or identifier"); set_err("Expected literal or identifier");
return; return;
} }
if (mode.kind == ExprModeStorageAddr) {
IRParam res; IRParam res;
TRY(res = tok_to_irparam(sc, &t->tok)); TRY(res = tok_to_irparam(&sc, &t->tok));
irtoks_app(s->ir, (IRTok){ irtoks_app(s->ir, (IRTok){
.ln = t->tok.ln, .ln = t->tok.ln,
.col = t->tok.col, .col = t->tok.col,
.instr = IRSet, .instr = IRSet,
.Unary = { .Unary = {
.addr = use_storage_addr ? storage_addr : sc->mem_addr++, .addr = mode.StorageAddr,
.val = res, .val = res,
}, },
}); });
toklist_del(s->toks, t, t); toklist_del(s->toks, t, t);
}
return; return;
} }
@ -284,15 +295,15 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
TRY(lhs->Val = eval_arith(instr, &lhs->Val, &rhs->Val)); TRY(lhs->Val = eval_arith(instr, &lhs->Val, &rhs->Val));
} else { } else {
IRParam lhs_irparam, rhs_irparam; IRParam lhs_irparam, rhs_irparam;
TRY(lhs_irparam = tok_to_irparam(sc, lhs)); TRY(lhs_irparam = tok_to_irparam(&sc, lhs));
TRY(rhs_irparam = tok_to_irparam(sc, rhs)); TRY(rhs_irparam = tok_to_irparam(&sc, rhs));
/* use the predefined storage address if it was requested and we're on the last operation */ /* use the predefined storage address if it was requested and we're on the last operation */
size_t res_addr; size_t res_addr;
if (use_storage_addr && is_last_operation) if (mode.kind == ExprModeStorageAddr && is_last_operation)
res_addr = storage_addr; res_addr = mode.StorageAddr;
else else
res_addr = sc->mem_addr++; res_addr = sc.mem_addr++;
/* emit IR code to evaluate the non-constant expression */ /* emit IR code to evaluate the non-constant expression */
irtoks_app(s->ir, (IRTok){ irtoks_app(s->ir, (IRTok){
@ -306,17 +317,18 @@ static void expr(State *s, Scope *parent_sc, TokListItem *t, bool toplevel, bool
}, },
}); });
if (mode.kind == ExprModeStorageAddr && is_last_operation) {
/* done */
toklist_del(s->toks, t, t);
break;
} else {
/* leave new memory address as result */ /* leave new memory address as result */
lhs->kind = TokIdent; lhs->kind = TokIdent;
lhs->Ident = (Identifier){ lhs->Ident = (Identifier){
.kind = IdentAddr, .kind = IdentAddr,
.Addr = res_addr, .Addr = res_addr,
}; };
}
if (use_storage_addr && is_last_operation)
/* Since the final result was written to the storage address,
* we're done. */
return;
} }
} }
} }
@ -336,15 +348,15 @@ static void stmt(State *s, Scope *sc, TokListItem *t) {
set_err("'%s' already declared in this scope", name); set_err("'%s' already declared in this scope", name);
return; return;
} }
TRY(expr(s, sc, t, true, true, addr)); TRY(expr(s, sc, t, (ExprMode){ .kind = ExprModeStorageAddr, .ignore_newln = false, .StorageAddr = addr }));
} else if (t->tok.kind == TokAssign) { } else if (t->tok.kind == TokAssign) {
t = t->next; t = t->next;
size_t addr; size_t addr;
TRY(addr = get_ident_addr(sc, name, &start->tok)); TRY(addr = get_ident_addr(sc, name, &start->tok));
TRY(expr(s, sc, t, true, true, addr)); TRY(expr(s, sc, t, (ExprMode){ .kind = ExprModeStorageAddr, .ignore_newln = false, .StorageAddr = addr }));
} }
} else if (t->tok.kind == TokOp && t->tok.Op == OpLCurl) { } else if (t->tok.kind == TokOp && t->tok.Op == OpLCurl) {
Scope inner_sc = make_scope(sc, sc->mem_addr, true); Scope inner_sc = make_scope(sc, true);
for (;;) { for (;;) {
if (t->next->tok.kind == TokOp) { if (t->next->tok.kind == TokOp) {
if (t->next->tok.Op == OpEOF) { if (t->next->tok.Op == OpEOF) {
@ -401,8 +413,9 @@ static void stmt(State *s, Scope *sc, TokListItem *t) {
/* finally we know where the jmp from the beginning has to jump to */ /* finally we know where the jmp from the beginning has to jump to */
s->ir->toks[jmp_instr_iaddr].Jmp.iaddr = s->ir->len; s->ir->toks[jmp_instr_iaddr].Jmp.iaddr = s->ir->len;
size_t addr = sc->mem_addr++; TRY(expr(s, sc, t, (ExprMode){ .kind = ExprModeJustCollapse, .ignore_newln = false }));
TRY(expr(s, sc, t, true, true, addr)); IRParam condition;
TRY(condition = tok_to_irparam(sc, &t->tok));
irtoks_app(s->ir, (IRTok){ irtoks_app(s->ir, (IRTok){
.ln = t->tok.ln, .ln = t->tok.ln,
@ -410,10 +423,7 @@ static void stmt(State *s, Scope *sc, TokListItem *t) {
.instr = IRJnz, .instr = IRJnz,
.CJmp = { .CJmp = {
.iaddr = jmp_instr_iaddr + 1, .iaddr = jmp_instr_iaddr + 1,
.condition = { .condition = condition,
.kind = IRParamAddr,
.Addr = addr,
},
}, },
}); });
} }
@ -424,7 +434,7 @@ IRToks parse(TokList *toks) {
IRToks ir; IRToks ir;
irtoks_init(&ir); irtoks_init(&ir);
State s = { .toks = toks, .ir = &ir }; State s = { .toks = toks, .ir = &ir };
Scope global_scope = make_scope(NULL, 0, true); Scope global_scope = make_scope(NULL, true);
for (;;) { for (;;) {
if (toks->begin->tok.kind == TokOp && toks->begin->tok.Op == OpEOF) if (toks->begin->tok.kind == TokOp && toks->begin->tok.Op == OpEOF)
break; break;