Skip to content

Nested Array Expressions support #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phobos2077 merged 1 commit into from
Mar 15, 2026
Merged

Nested Array Expressions support #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,10 +1126,10 @@ static void factor(Procedure *p, NodeList *nodes) {
}
break;
case '[':
parseArrayConstant(p, nodes);
parseArrayExpression(p, nodes);
break;
case '{':
parseAssocArrayConstant(p, nodes);
parseAssocArrayExpression(p, nodes);
break;
default:
parseLibExpression(p, nodes, i);
Expand Down
60 changes: 39 additions & 21 deletions parseext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
extern int loopNesting;
extern Program *currentProgram;

static int arrayExpressionNesting = 0;

#define ARRAYFLAG_EXPR_PUSH (32) // is created as part of array sub-expression
#define ARRAYFLAG_EXPR_POP (64) // is used to indicate end of array sub-expression, not used in actual array

// vars, constants, etc.
void emitNodeExpr(Procedure *p, NodeList *n, LexData *data) {
emitOp(p, n, T_START_EXPRESSION);
Expand Down Expand Up @@ -413,14 +418,25 @@ void parseSwitch(Procedure *p, NodeList *n) {
if(expectToken(T_END)==-1) parseError("Expected end");
}

void parseAssocArrayConstant(Procedure *p, NodeList *n) {
emitOp(p, n, T_TS_TEMP_ARRAY);
static void emitIntConstIntExpr(Procedure *p, NodeList *n, int i) {
emitOp(p, n, T_START_EXPRESSION);
emitInt(p, n, -1);
emitOp(p, n, T_END_EXPRESSION);
emitOp(p, n, T_START_EXPRESSION);
emitInt(p, n, 0);
emitInt(p, n, i);
emitOp(p, n, T_END_EXPRESSION);
}

static void emitSubExpressionTerminator(Procedure *p, NodeList *n) {
// Special temp_array call that will not actually create any array, but pop the internal expression stack for nested expressions to work properly
emitOp(p, n, T_TS_TEMP_ARRAY);
emitIntConstIntExpr(p, n, 0);
emitIntConstIntExpr(p, n, ARRAYFLAG_EXPR_POP);
emitOp(p, n, '+');
}

void parseAssocArrayExpression(Procedure *p, NodeList *n) {
arrayExpressionNesting++;
emitOp(p, n, T_TS_TEMP_ARRAY);
emitIntConstIntExpr(p, n, -1);
emitIntConstIntExpr(p, n, arrayExpressionNesting > 1 ? ARRAYFLAG_EXPR_PUSH : 0);
if (lex() != '}') {
ungetToken();
emitOp(p, n, T_TS_STACK_ARRAY);
Expand All @@ -440,31 +456,30 @@ void parseAssocArrayConstant(Procedure *p, NodeList *n) {
parseError("Mismatched '{}'");
}
}
return;
if (arrayExpressionNesting > 1) {
emitSubExpressionTerminator(p, n);
}
arrayExpressionNesting--;
}

void parseArrayConstant(Procedure *p, NodeList *n) {
void parseArrayExpression(Procedure *p, NodeList *n) {
int i;
arrayExpressionNesting++;

emitOp(p, n, T_TS_TEMP_ARRAY);
for (i=0; i<2; i++) {
emitOp(p, n, T_START_EXPRESSION);
emitInt(p, n, 0);
emitOp(p, n, T_END_EXPRESSION);
}
emitIntConstIntExpr(p, n, 0); // size
emitIntConstIntExpr(p, n, arrayExpressionNesting > 1 ? ARRAYFLAG_EXPR_PUSH : 0);

if (lex() != ']') {
ungetToken();
emitOp(p, n, T_TS_STACK_ARRAY);
emitOp(p, n, T_START_EXPRESSION);
emitInt(p, n, 0);
emitOp(p, n, T_END_EXPRESSION);
emitIntConstIntExpr(p, n, 0); // first index
parseExpression(p, n);
emitOp(p, n, '+');
i=1;
i = 1;
while (lex() == ',') {
emitOp(p, n, T_TS_STACK_ARRAY);
emitOp(p, n, T_START_EXPRESSION);
emitInt(p, n, i);
emitOp(p, n, T_END_EXPRESSION);
emitIntConstIntExpr(p, n, i); // index
parseExpression(p, n);
emitOp(p, n, '+');
i++;
Expand All @@ -474,5 +489,8 @@ void parseArrayConstant(Procedure *p, NodeList *n) {
parseError("Mismatched '[]'");
}
}
return;
if (arrayExpressionNesting > 1) {
emitSubExpressionTerminator(p, n);
}
arrayExpressionNesting--;
}
4 changes: 2 additions & 2 deletions parseext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void parseArrayAssignment(Procedure *p, NodeList *nodes, LexData symb);
void parseFor(Procedure *p, NodeList *n);
void parseForEach(Procedure *p, NodeList *n);
void parseSwitch(Procedure *p, NodeList *n);
void parseAssocArrayConstant(Procedure *p, NodeList *n);
void parseArrayConstant(Procedure *p, NodeList *n);
void parseAssocArrayExpression(Procedure *p, NodeList *n);
void parseArrayExpression(Procedure *p, NodeList *n);

#endif