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

Fix assignments to single complex assignment targets (trailing commas)

Browse Source
This commit is contained in:
K. Lange 2021-04-23 14:15:14 +09:00
parent b51704f96e
commit 3733c996bc
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler.c
View File

@ -1891,9 +1891,11 @@ static void forStatement(void) {
beginScope(); beginScope();
ssize_t loopInd = current->localCount; ssize_t loopInd = current->localCount;
int sawComma = 0;
ssize_t varCount = 0; ssize_t varCount = 0;
int matchedEquals = 0; int matchedEquals = 0;
do { do {
if (!check(TOKEN_IDENTIFIER)) break;
ssize_t ind = parseVariable("Expected name for loop iterator."); ssize_t ind = parseVariable("Expected name for loop iterator.");
if (parser.hadError) return; if (parser.hadError) return;
if (match(TOKEN_EQUAL)) { if (match(TOKEN_EQUAL)) {
@ -1904,6 +1906,7 @@ static void forStatement(void) {
} }
defineVariable(ind); defineVariable(ind);
varCount++; varCount++;
if (check(TOKEN_COMMA)) sawComma = 1;
} while (match(TOKEN_COMMA)); } while (match(TOKEN_COMMA));
int loopStart; int loopStart;
@ -1920,7 +1923,7 @@ static void forStatement(void) {
loopStart = currentChunk()->count; loopStart = currentChunk()->count;
exitJump = emitJump(OP_CALL_ITER); exitJump = emitJump(OP_CALL_ITER);
if (varCount > 1) { if (varCount > 1 || sawComma) {
EMIT_OPERAND_OP(OP_UNPACK, varCount); EMIT_OPERAND_OP(OP_UNPACK, varCount);
for (ssize_t i = loopInd + varCount - 1; i >= loopInd; i--) { for (ssize_t i = loopInd + varCount - 1; i >= loopInd; i--) {
EMIT_OPERAND_OP(OP_SET_LOCAL, i); EMIT_OPERAND_OP(OP_SET_LOCAL, i);
@ -2675,12 +2678,15 @@ static void super_(int exprType) {
static void comprehensionInner(KrkScanner scannerBefore, Parser parserBefore, void (*body)(size_t), size_t arg) { static void comprehensionInner(KrkScanner scannerBefore, Parser parserBefore, void (*body)(size_t), size_t arg) {
ssize_t loopInd = current->localCount; ssize_t loopInd = current->localCount;
ssize_t varCount = 0; ssize_t varCount = 0;
int sawComma = 0;
do { do {
if (!check(TOKEN_IDENTIFIER)) break;
defineVariable(parseVariable("Expected name for iteration variable.")); defineVariable(parseVariable("Expected name for iteration variable."));
if (parser.hadError) return; if (parser.hadError) return;
emitByte(OP_NONE); emitByte(OP_NONE);
defineVariable(loopInd); defineVariable(loopInd);
varCount++; varCount++;
if (check(TOKEN_COMMA)) sawComma = 1;
} while (match(TOKEN_COMMA)); } while (match(TOKEN_COMMA));
consume(TOKEN_IN, "Only iterator loops (for ... in ...) are allowed in generator expressions."); consume(TOKEN_IN, "Only iterator loops (for ... in ...) are allowed in generator expressions.");
@ -2694,7 +2700,7 @@ static void comprehensionInner(KrkScanner scannerBefore, Parser parserBefore, vo
int loopStart = currentChunk()->count; int loopStart = currentChunk()->count;
int exitJump = emitJump(OP_CALL_ITER); int exitJump = emitJump(OP_CALL_ITER);
if (varCount > 1) { if (varCount > 1 || sawComma) {
EMIT_OPERAND_OP(OP_UNPACK, varCount); EMIT_OPERAND_OP(OP_UNPACK, varCount);
for (ssize_t i = loopInd + varCount - 1; i >= loopInd; i--) { for (ssize_t i = loopInd + varCount - 1; i >= loopInd; i--) {
EMIT_OPERAND_OP(OP_SET_LOCAL, i); EMIT_OPERAND_OP(OP_SET_LOCAL, i);
@ -3052,7 +3058,7 @@ static void ternary(ChunkRecorder before, KrkScanner oldScanner, Parser oldParse
static void complexAssignmentTargets(KrkScanner oldScanner, Parser oldParser, size_t targetCount, int parenthesized) { static void complexAssignmentTargets(KrkScanner oldScanner, Parser oldParser, size_t targetCount, int parenthesized) {
emitBytes(OP_DUP, 0); emitBytes(OP_DUP, 0);
if (targetCount > 1) { if (targetCount > 0) {
EMIT_OPERAND_OP(OP_UNPACK,targetCount); EMIT_OPERAND_OP(OP_UNPACK,targetCount);
EMIT_OPERAND_OP(OP_REVERSE,targetCount); EMIT_OPERAND_OP(OP_REVERSE,targetCount);
} }

19
test/testSingularExpandedAssignment.krk Normal file
View File

@ -0,0 +1,19 @@
let x, y, z
x, = (1,)
assert x == 1
y, = [2]
assert y == 2
for a, in [(1,),(2,),(3,)]:
print(a)
try:
z, = 1
except TypeError:
print("okay")
print(list(x * x for x, in [(1,),[2],(3,)]))

5
test/testSingularExpandedAssignment.krk.expect Normal file
View File

@ -0,0 +1,5 @@
1
2
3
okay
[1, 4, 9]