kuroko-lang/kuroko
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support chained 'for's in generator expressions

Browse Source
This commit is contained in:
K. Lange 2021-03-06 15:32:30 +09:00
parent 0f6b74ff5b
commit 35b4032de3
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/compiler.c
View File

@ -2252,23 +2252,8 @@ static void singleInner(ssize_t indLoopCounter) {
expression();
}
/**
* @brief Parser a generator expression.
*
* This is essentially the same as a comprehension body, but
* without the added loop index or wrapping function call.
*
* After every inner expression, we yield.
*/
static void generatorExpression(KrkScanner scannerBefore, Parser parserBefore) {
parser.previous = syntheticToken("<genexpr>");
Compiler subcompiler;
initCompiler(&subcompiler, TYPE_FUNCTION);
subcompiler.function->chunk.filename = subcompiler.enclosing->function->chunk.filename;
subcompiler.function->isGenerator = 1;
beginScope();
static void generatorInner(KrkScanner scannerBefore, Parser parserBefore) {
ssize_t loopInd = current->localCount;
ssize_t varCount = 0;
do {
@ -2320,21 +2305,43 @@ static void generatorExpression(KrkScanner scannerBefore, Parser parserBefore) {
emitByte(OP_POP); /* Pop condition */
}
beginScope();
if (match(TOKEN_FOR)) {
generatorInner(scannerBefore, parserBefore);
} else {
KrkScanner scannerAfter = krk_tellScanner();
Parser parserAfter = parser;
krk_rewindScanner(scannerBefore);
parser = parserBefore;
beginScope();
expression();
emitByte(OP_YIELD);
endScope();
krk_rewindScanner(scannerAfter);
parser = parserAfter;
}
endScope();
emitLoop(loopStart);
patchJump(exitJump);
}
/**
* @brief Parser a generator expression.
*
* This is essentially the same as a comprehension body, but
* without the added loop index or wrapping function call.
*
* After every inner expression, we yield.
*/
static void generatorExpression(KrkScanner scannerBefore, Parser parserBefore) {
parser.previous = syntheticToken("<genexpr>");
Compiler subcompiler;
initCompiler(&subcompiler, TYPE_FUNCTION);
subcompiler.function->chunk.filename = subcompiler.enclosing->function->chunk.filename;
subcompiler.function->isGenerator = 1;
beginScope();
generatorInner(scannerBefore, parserBefore);
endScope();
KrkFunction *subfunction = endCompiler();
size_t indFunc = krk_addConstant(currentChunk(), OBJECT_VAL(subfunction));

2
test/testGeneratorExpressions.krk
View File

@ -19,3 +19,5 @@ try:
except SyntaxError as e:
print('parenthesized' in str(e))
let matrix = [[1,2,3,4],[5,6,7,8],[9,10,11,12],[13,14,15,16]]
print(list(entry for row in matrix for entry in row))

1
test/testGeneratorExpressions.krk.expect
View File

@ -3,3 +3,4 @@
True
285
True
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]