Merge branch 'main' into renovate/xtext.version

Author: dschwartznyc

pom.xml

@@ -81,7 +81,7 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.68.0</rosetta.dsl.version>
+        <rosetta.dsl.version>9.70.0</rosetta.dsl.version>
 
         <xtext.version>2.41.0</xtext.version>
         <guice.version>6.0.0</guice.version>

src/main/java/com/regnosys/rosetta/generator/python/expressions/PythonExpressionGenerator.xtend

@@ -32,7 +32,6 @@ import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaNumberLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyElement
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyExistsExpression
-import com.regnosys.rosetta.rosetta.expression.RosettaReference
 import com.regnosys.rosetta.rosetta.expression.RosettaStringLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference
 import com.regnosys.rosetta.rosetta.expression.SortOperation
@@ -109,7 +108,8 @@ class PythonExpressionGenerator {
             RosettaFeatureCall: generateFeatureCall(expr, ifLevel, isLambda)
             RosettaOnlyElement: '''rune_get_only_element(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             RosettaOnlyExistsExpression: '''rune_check_one_of(self, «generateExpression(expr.getArgs().get(0), ifLevel, isLambda)»)'''
-            RosettaReference: generateReference(expr, ifLevel, isLambda)
+            RosettaSymbolReference: generateSymbolReference(expr, ifLevel, isLambda)
+            RosettaImplicitVariable: generateImplicitVariable(expr, ifLevel, isLambda)
             default:{
                 throw new UnsupportedOperationException("Unsupported expression type of " + expr?.class?.simpleName)
             }
@@ -260,12 +260,8 @@ class PythonExpressionGenerator {
         return _builder.toString
     }
 
-
-    private def String generateReference(RosettaReference expr, int ifLevel, boolean isLambda) {
-        switch (expr) {
-            RosettaImplicitVariable: '''«expr.name»'''
-            RosettaSymbolReference:  generateSymbolReference(expr, ifLevel, isLambda)
-        }
+    private def String generateImplicitVariable(RosettaImplicitVariable expr, int ifLevel, boolean isLambda) {
+        '''«expr.name»'''
     }
 
     private def String generateSymbolReference(RosettaSymbolReference expr, int ifLevel, boolean isLambda) {

src/main/java/com/regnosys/rosetta/generator/python/func/FunctionDependencyProvider.xtend

@@ -16,7 +16,7 @@ import com.regnosys.rosetta.rosetta.expression.RosettaFeatureCall
 import com.regnosys.rosetta.rosetta.expression.RosettaFunctionalOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyExistsExpression
-import com.regnosys.rosetta.rosetta.expression.RosettaReference
+import com.regnosys.rosetta.rosetta.expression.RosettaImplicitVariable
 import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference
 import com.regnosys.rosetta.rosetta.expression.RosettaUnaryOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaDeepFeatureCall
@@ -94,7 +94,7 @@ class FunctionDependencyProvider {
             RosettaExternalFunction,
             RosettaEnumValueReference,
             RosettaLiteral,
-            RosettaReference,
+            RosettaImplicitVariable,
             RosettaSymbol,
             RosettaDeepFeatureCall:
                 dependencies = newHashSet()