code changes for better scala code generation.

finos · Aug 30, 2023 · b5594f0 · b5594f0
1 parent 50bdb76
commit b5594f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Morphir/IR/FormatVersion.elm b/src/Morphir/IR/FormatVersion.elm
@@ -0,0 +1,9 @@
+module Morphir.IR.FormatVersion exposing (..)
+
+import Morphir.IR.Distribution exposing (Distribution)
+
+
+type alias VersionedDistribution =
+    { formatVersion : Int
+    , distribution : Distribution
+    }
diff --git a/src/Morphir/IR/Value.elm b/src/Morphir/IR/Value.elm
@@ -374,7 +374,7 @@ typeAndValueToDefinition valueType value =
             case ( body, bodyType ) of
                 ( Lambda va (AsPattern _ (WildcardPattern _) argName) lambdaBody, Type.Function _ argType returnType ) ->
                     liftLambdaArguments
-                        (args ++ [ ( argName, va, argType ) ])
+                        (List.append args [ ( argName, va, argType ) ])
                         returnType
                         lambdaBody
 

diff --git a/src/Morphir/Scala/PrettyPrinter.elm b/src/Morphir/Scala/PrettyPrinter.elm
@@ -339,7 +339,7 @@ mapArgDecl opt argDecl =
                 Nothing ->
                     empty
     in
-    mapModifiers argDecl.modifiers ++ argDecl.name ++ ": " ++ mapType opt argDecl.tpe ++ defaultValueDoc
+    mapModifiers argDecl.modifiers ++ prefixKeyword argDecl.name ++ ": " ++ mapType opt argDecl.tpe ++ defaultValueDoc
 
 
 mapType : Options -> Type -> Doc
@@ -623,7 +623,7 @@ mapPattern pattern =
             "Nil"
 
         HeadTailMatch headPattern tailPattern ->
-            mapPattern headPattern ++ " :: " ++ mapPattern tailPattern
+            parens (mapPattern headPattern ++ " :: " ++ mapPattern tailPattern)
 
         CommentedPattern childPattern message ->
             mapPattern childPattern ++ " /* " ++ message ++ " */ "
@@ -643,7 +643,7 @@ mapLit lit =
             "'" ++ String.fromChar char ++ "'"
 
         StringLit string ->
-            "\"" ++ string ++ "\""
+            "\"\"\"" ++ string ++ "\"\"\""
 
         IntegerLit int ->
             String.fromInt int