fix: yielded placeholders in block lambdas are now assigned a prefix

fix: return correct code for enum variant expression fix: handle BlockLambdaResult in SdsMemberAccess test: updated "expressions/block lambda" and "assignment" tests
Safe-DS · Oct 19, 2023 · bcf9fb5 · bcf9fb5
1 parent 564896a
commit bcf9fb5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/src/cli/generator.ts b/src/cli/generator.ts
@@ -1,11 +1,21 @@
 import fs from 'fs';
-import { expandToString, expandToStringWithNL, findRootNode, getDocument, streamAllContents } from 'langium';
+import {
+    expandToString,
+    expandToStringWithNL,
+    findRootNode,
+    getContainerOfType,
+    getDocument,
+    streamAllContents,
+} from 'langium';
 import path from 'path';
 import {
+    isSdsAbstractResult,
     isSdsAssignment,
     isSdsBlockLambda,
     isSdsBlockLambdaResult,
     isSdsCall,
+    isSdsCallable,
+    isSdsEnum,
     isSdsEnumVariant,
     isSdsExpressionLambda,
     isSdsExpressionStatement,
@@ -21,7 +31,6 @@ import {
     isSdsPrefixOperation,
     isSdsQualifiedImport,
     isSdsReference,
-    isSdsResult,
     isSdsSegment,
     isSdsTemplateString,
     isSdsTemplateStringEnd,
@@ -203,7 +212,6 @@ const generateParameter = function (
     frame: GenerationInfoFrame,
     defaultValue: boolean = true,
 ): string {
-    // TODO isConstant?
     return expandToString`${getPythonNameOrDefault(frame.getServices(), parameter)}${
         defaultValue && parameter.defaultValue !== undefined
             ? '=' + generateExpression(parameter.defaultValue, frame)
@@ -310,7 +318,7 @@ const generateAssignment = function (assignment: SdsAssignment, frame: Generatio
 
 const generateAssignee = function (assignee: SdsAssignee): string {
     if (isSdsBlockLambdaResult(assignee)) {
-        return assignee.name;
+        return `__block_lambda_${assignee.name}`;
     } else if (isSdsPlaceholder(assignee)) {
         return assignee.name;
     } else if (isSdsWildcard(assignee)) {
@@ -325,7 +333,7 @@ const generateBlockLambda = function (blockLambda: SdsBlockLambda, frame: Genera
     const lambdaResult = blockLambdaResultsOrEmpty(blockLambda);
     let lambdaBlock = generateBlock(blockLambda.body, frame);
     if (lambdaResult.length !== 0 && lambdaBlock !== 'pass') {
-        lambdaBlock += `\nreturn ${lambdaResult.map((result) => result.name).join(', ')}`;
+        lambdaBlock += `\nreturn ${lambdaResult.map((result) => `__block_lambda_${result.name}`).join(', ')}`;
     }
     return expandToString`def ${frame.getUniqueLambdaBlockName(blockLambda)}(${generateParameters(
         blockLambda.parameterList,
@@ -375,7 +383,8 @@ const generateExpression = function (expression: SdsExpression, frame: Generatio
         } else if (potentialConstantExpression instanceof ConstantString) {
             return `'${formatStringSingleLine(potentialConstantExpression.value)}'`;
         } else if (potentialConstantExpression instanceof ConstantEnumVariant) {
-            return potentialConstantExpression.value.name; // TODO correct interpretation of SdsEnumVariant / SdsConstantEnumVariant?
+            const enumType = getContainerOfType(potentialConstantExpression.value, isSdsEnum);
+            return `${enumType!.name}.${potentialConstantExpression.value.name}`;
         }
     }
 
@@ -424,7 +433,6 @@ const generateExpression = function (expression: SdsExpression, frame: Generatio
     if (isSdsMemberAccess(expression)) {
         const member = expression.member?.target.ref!;
         const receiver = generateExpression(expression.receiver, frame);
-        // TODO SdsBlockLambdaResult should not be possible? Grammar defines SdsBlockLambdaResult as only part of an assignment. There is no way to parse it anywhere else
         if (isSdsEnumVariant(member)) {
             const enumMember = generateExpression(expression.member!, frame);
             const suffix = isSdsCall(expression.$container) ? '' : '()';
@@ -434,8 +442,8 @@ const generateExpression = function (expression: SdsExpression, frame: Generatio
             } else {
                 return `${receiver}.${enumMember}${suffix}`;
             }
-        } else if (isSdsResult(member)) {
-            const resultList = member.$container.results;
+        } else if (isSdsAbstractResult(member)) {
+            const resultList = abstractResultsOrEmpty(getContainerOfType(member, isSdsCallable));
             if (resultList.length === 1) {
                 return receiver;
             }

diff --git a/...urces/generation/expressions/block lambda/output/tests/generator/blockLambda/gen_input.py b/...urces/generation/expressions/block lambda/output/tests/generator/blockLambda/gen_input.py
@@ -2,12 +2,12 @@
 
 def test():
     def __block_lambda_0(a, b=2):
-        d = g()
-        return d
+        __block_lambda_d = g()
+        return __block_lambda_d
     f1(__block_lambda_0)
     def __block_lambda_1(a, c):
-        d = g()
-        return d
+        __block_lambda_d = g()
+        return __block_lambda_d
     f2(__block_lambda_1)
     def __block_lambda_2():
         pass

diff --git a/...resources/generation/statements/assignment/output/tests/generator/assignment/gen_input.py b/...resources/generation/statements/assignment/output/tests/generator/assignment/gen_input.py
@@ -18,9 +18,9 @@ def testPipeline():
     f1(x)
     def __block_lambda_0():
         g()
-        a, _, c = g()
+        a, _, __block_lambda_c = g()
         x, _, _ = g()
         f1(a)
         f1(x)
-        return c
+        return __block_lambda_c
     f2(__block_lambda_0)