Merge pull request #10 from Cloudrisk/feature/dsl-bundle-upgrade

revert to new DSL function changes

Author: dschwartz-ftadvisory

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

@@ -434,4 +434,4 @@ class PythonExpressionGenerator {
             importsFound.add(import)
         }
     }
-}
+}

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

@@ -12,6 +12,10 @@ import com.regnosys.rosetta.rosetta.simple.Data
 import com.regnosys.rosetta.rosetta.simple.Function
 import com.regnosys.rosetta.rosetta.simple.Operation
 import com.regnosys.rosetta.rosetta.simple.Segment
+import com.regnosys.rosetta.rosetta.simple.ShortcutDeclaration
+import com.regnosys.rosetta.rosetta.simple.Condition
+import com.regnosys.rosetta.rosetta.RosettaFeature
+import com.regnosys.rosetta.rosetta.RosettaTyped
 import java.util.ArrayList
 import java.util.Collections
 import java.util.HashMap
@@ -283,7 +287,7 @@ class PythonFunctionGenerator {
     private def generateAddOperation(AssignPathRoot root, Operation operation, Function function, String expression) {
         val lineSeparator = System.getProperty("line.separator")
         val attribute = root as Attribute
-        val fullPath = generateFullPath(operation.getPath().getReversedAttributes, root.name)
+        val fullPath = generateFullPath(operation.getPath().getReversedFeatures, root.name)
 
         var result = ""
         if (attribute.typeCall.type instanceof RosettaEnumeration) {
@@ -324,7 +328,7 @@ class PythonFunctionGenerator {
         var result = new StringBuilder()
         result.append("'")
         while (currentPath !== null) {
-            result.append(currentPath.getAttribute().name)
+            result.append(currentPath.getFeature().name)
             if (currentPath.next !== null) {
                 result.append("->")
             }
@@ -336,8 +340,8 @@ class PythonFunctionGenerator {
 
     private def getNextPathElementName(Segment path) {
         if (path !== null) {
-            val attribute = path.getAttribute()
-            return "'" + attribute.name + "'"
+            val feature = path.getFeature()
+            return "'" + feature.name + "'"
         }
         return null
     }
@@ -355,32 +359,32 @@ class PythonFunctionGenerator {
 
     }
 
-    private def String generateFullPath(Iterable<Attribute> attrs, String root) {
-        if (attrs.isEmpty) {
+    private def String generateFullPath(Iterable<RosettaFeature> features, String root) {
+        if (features.isEmpty) {
             return "self"
         }
 
-        val attr = attrs.head
-        val remainingAttrs = attrs.tail.toList
+        val attr = features.head
+        val remainingAttrs = features.tail.toList
 
         val nextPath = if (remainingAttrs.isEmpty) '''rune_resolve_attr(self, «root»)''' else generateFullPath(
                 remainingAttrs, root)
 
         return '''rune_resolve_attr(«nextPath», '«attr.name»')'''
     }
 
-    private def getReversedAttributes(Segment segment) {
-        val attributes = new ArrayList<Attribute>();
+    private def getReversedFeatures(Segment segment) {
+        val features = new ArrayList<RosettaFeature>();
         var current = segment;
 
         while (current !== null) {
-            attributes.add(current.getAttribute());
+            features.add(current.getFeature());
             current = current.getNext();
         }
 
-        Collections.reverse(attributes);
+        Collections.reverse(features);
 
-        return attributes;
+        return features;
     }
 
     def addImportsFromConditions(String variable, String namespace) {
@@ -389,4 +393,4 @@ class PythonFunctionGenerator {
             importsFound.add(import)
         }
     }
-}
+}