CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2024-11-21 23:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cparse.c: refactoring

Browse Source 
- remove declaration(), replace calls with statement()
- fix possible UB in parsePrecedence; no idea how this *wasn't* causing a segfault tbh
This commit is contained in:
cpunch 2023-12-28 23:20:19 -06:00
parent 93f3ae1106
commit 105a3d70c3
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cparse.c
View File

@ -102,7 +102,6 @@ static int expressionPrecedence(CParseState *pstate, int needed, Precedence prec
// returns # of pushed values onto the stack // returns # of pushed values onto the stack
static int expression(CParseState *pstate, int needed, bool forceNeeded); static int expression(CParseState *pstate, int needed, bool forceNeeded);
static void statement(CParseState *pstate); static void statement(CParseState *pstate);
static void declaration(CParseState *pstate);
static void parseFunction(CParseState *pstate, FunctionType type); static void parseFunction(CParseState *pstate, FunctionType type);
static void expressionStatement(CParseState *pstate); static void expressionStatement(CParseState *pstate);
static ParseRule *getRule(CTokenType type); static ParseRule *getRule(CTokenType type);
@ -1099,18 +1098,19 @@ static ParseRule *getRule(CTokenType type)
// returns true if it got past the first token (aka prefix wasn't null) // returns true if it got past the first token (aka prefix wasn't null)
static bool parsePrecedence(CParseState *pstate, Precedence prec) static bool parsePrecedence(CParseState *pstate, Precedence prec)
{ {
bool canAssign;
ParseFunc prefix, infix;
advance(pstate); advance(pstate);
if ((prefix = getRule(pstate->previous.type)->prefix) == NULL)
ParseFunc prefix = getRule(pstate->previous.type)->prefix;
if (prefix == NULL)
return false; return false;
bool canAssign = prec <= PREC_ASSIGNMENT; canAssign = prec <= PREC_ASSIGNMENT;
prefix(pstate, canAssign, prec); prefix(pstate, canAssign, prec);
while (prec <= getRule(pstate->current.type)->level) { while (prec <= getRule(pstate->current.type)->level) {
ParseFunc infix = getRule(pstate->current.type)->infix; if ((infix = getRule(pstate->current.type)->infix) == NULL)
break;
advance(pstate); advance(pstate);
infix(pstate, canAssign, prec); infix(pstate, canAssign, prec);
} }
@ -1264,7 +1264,7 @@ static void endScope(CParseState *pstate)
static void block(CParseState *pstate) static void block(CParseState *pstate)
{ {
while (!check(pstate, TOKEN_END) && !check(pstate, TOKEN_EOF) && !check(pstate, TOKEN_ERROR)) { while (!check(pstate, TOKEN_END) && !check(pstate, TOKEN_EOF) && !check(pstate, TOKEN_ERROR)) {
declaration(pstate); statement(pstate);
} }
consume(pstate, TOKEN_END, "'end' expected to end block.'"); consume(pstate, TOKEN_END, "'end' expected to end block.'");
@ -1321,7 +1321,7 @@ static void ifStatement(CParseState *pstate)
while (!check(pstate, TOKEN_END) && !check(pstate, TOKEN_ELSE) && while (!check(pstate, TOKEN_END) && !check(pstate, TOKEN_ELSE) &&
!check(pstate, TOKEN_ELSEIF) && !check(pstate, TOKEN_EOF) && !check(pstate, TOKEN_ELSEIF) && !check(pstate, TOKEN_EOF) &&
!check(pstate, TOKEN_ERROR)) { !check(pstate, TOKEN_ERROR)) {
declaration(pstate); statement(pstate);
} }
endScope(pstate); endScope(pstate);
@ -1765,11 +1765,6 @@ static void statement(CParseState *pstate)
expressionStatement(pstate); expressionStatement(pstate);
} }
static void declaration(CParseState *pstate)
{
statement(pstate);
}
static CObjFunction *endCompiler(CParseState *pstate) static CObjFunction *endCompiler(CParseState *pstate)
{ {
popLocals(pstate, pstate->compiler->scopeDepth + 1); // remove the locals from other scopes popLocals(pstate, pstate->compiler->scopeDepth + 1); // remove the locals from other scopes
@ -1794,7 +1789,7 @@ CObjFunction *cosmoP_compileString(CState *state, const char *source, const char
advance(&parser); advance(&parser);
while (!match(&parser, TOKEN_EOF)) { while (!match(&parser, TOKEN_EOF)) {
declaration(&parser); statement(&parser);
} }
consume(&parser, TOKEN_EOF, "End of file expected!"); consume(&parser, TOKEN_EOF, "End of file expected!");