Added a new module Sapl.Target.CleanFlavour that contains the clean.f flavour...

Added a new module Sapl.Target.CleanFlavour that contains the clean.f flavour as a predefined Clean value

src/Sapl/Optimization/StrictnessPropagation.icl

@@ -20,7 +20,7 @@ where
 								= checkInline
 								
 	checkInline =  case get n inlineFunctions of
-					(Just def) 	= if (nr_args < def.arity || i >= def.arity) False (def.strictness.[i] == '1')
+					(Just def) 	= if (nr_args < def.InlineFunDef.arity || i >= def.InlineFunDef.arity) False (def.strictness.[i] == '1')
 							   	= False
 
 doStrictnessPropagation :: !ParserState !IsStrictArgFun ![FuncType] -> (![FuncType], !ParserState)
@@ -108,4 +108,4 @@ where
 		
 	walk sd t = (sd, t)
 			
-	
\ No newline at end of file
+	

src/Sapl/Target/CleanFlavour.dcl

+definition module Sapl.Target.CleanFlavour
+/**
+* Built in Flavour defintion for Clean.
+* You can use this instead of having your program parse a clean.f flavour file at runtime each time
+*/
+from Sapl.Target.Flavour import :: Flavour
+
+//The flavour definition for Clean
+cleanFlavour :: Flavour

src/Sapl/Target/CleanFlavour.icl

+implementation module Sapl.Target.CleanFlavour
+import Sapl.Target.Flavour
+
+cleanFlavour :: Flavour
+cleanFlavour = fromFlavourRep {
+   fun_prefix="__",
+   options=["enableStrictnessPropagation"],
+   bifs=[
+      {sapl_fun="addI",arity=2,data_cons=Nothing,ext_fun=Just "_add",inline_exp=Just ":!1: + :!2:"},
+      {sapl_fun="addR",arity=2,data_cons=Nothing,ext_fun=Just "_add",inline_exp=Just ":!1: + :!2:"},
+      {sapl_fun="subI",arity=2,data_cons=Nothing,ext_fun=Just "_sub",inline_exp=Just ":!1: - :!2:"},
+      {sapl_fun="subR",arity=2,data_cons=Nothing,ext_fun=Just "_sub",inline_exp=Just ":!1: - :!2:"},
+      {sapl_fun="multI",arity=2,data_cons=Nothing,ext_fun=Just "_mult",inline_exp=Just ":!1: * :!2:"},
+      {sapl_fun="multR",arity=2,data_cons=Nothing,ext_fun=Just "_mult",inline_exp=Just ":!1: * :!2:"},
+      {sapl_fun="divI",arity=2,data_cons=Nothing,ext_fun=Just "_div",inline_exp=Just "Math.floor(:!1: / :!2:)"},
+      {sapl_fun="divR",arity=2,data_cons=Nothing,ext_fun=Just "_divreal",inline_exp=Just ":!1: / :!2:"},
+      {sapl_fun="mod",arity=2,data_cons=Nothing,ext_fun=Just "_mod",inline_exp=Just "=!1= % =!2="},
+      {sapl_fun="powI",arity=2,data_cons=Nothing,ext_fun=Just "_pow",inline_exp=Just "Math.pow(:!1:,:!2:)"},
+      {sapl_fun="powR",arity=2,data_cons=Nothing,ext_fun=Just "_pow",inline_exp=Just "Math.pow(:!1:,:!2:)"},
+      {sapl_fun="sqrt",arity=1,data_cons=Nothing,ext_fun=Just "_sqrt",inline_exp=Just "Math.sqrt(:!1:)"},
+      {sapl_fun="atan",arity=1,data_cons=Nothing,ext_fun=Just "_atan",inline_exp=Just "Math.atan(:!1:)"},
+      {sapl_fun="sin",arity=1,data_cons=Nothing,ext_fun=Just "_sin",inline_exp=Just "Math.sin(:!1:)"},
+      {sapl_fun="cos",arity=1,data_cons=Nothing,ext_fun=Just "_cos",inline_exp=Just "Math.cos(:!1:)"},
+	  {sapl_fun="neg",arity=1,data_cons=Nothing,ext_fun=Just "_neg",inline_exp=Just ":!1: * -1"},
+      {sapl_fun="negR",arity=1,data_cons=Nothing,ext_fun=Just "_neg",inline_exp=Just ":!1: * -1"},
+      {sapl_fun="negI",arity=1,data_cons=Nothing,ext_fun=Just "_neg",inline_exp=Just ":!1: * -1"},
+	  {sapl_fun="absI",arity=1,data_cons=Nothing,ext_fun=Just "_abs",inline_exp=Just "Math.abs(:!1:)"},
+	  {sapl_fun="absR",arity=1,data_cons=Nothing,ext_fun=Just "_abs",inline_exp=Just "Math.abs(:!1:)"},
+	  {sapl_fun="eqI",arity=2,data_cons=Nothing,ext_fun=Just "_eq",inline_exp=Just ":!1: == :!2:"},
+	  {sapl_fun="eqR",arity=2,data_cons=Nothing,ext_fun=Just "_eq",inline_exp=Just ":!1: == :!2:"},
+	  {sapl_fun="eqC",arity=2,data_cons=Nothing,ext_fun=Just "_eq",inline_exp=Just ":!1: == :!2:"},
+	  {sapl_fun="eqB",arity=2,data_cons=Nothing,ext_fun=Just "_eq",inline_exp=Just ":!1: == :!2:"},
+	  {sapl_fun="eqS",arity=2,data_cons=Nothing,ext_fun=Just "_eq",inline_exp=Just ":!1: == :!2:"},
+	  {sapl_fun="neqI",arity=2,data_cons=Nothing,ext_fun=Just "_neq",inline_exp=Just ":!1: != :!2:"},
+	  {sapl_fun="neqR",arity=2,data_cons=Nothing,ext_fun=Just "_neq",inline_exp=Just ":!1: != :!2:"},
+	  {sapl_fun="neqC",arity=2,data_cons=Nothing,ext_fun=Just "_neq",inline_exp=Just ":!1: != :!2:"},
+	  {sapl_fun="neqB",arity=2,data_cons=Nothing,ext_fun=Just "_neq",inline_exp=Just ":!1: != :!2:"},
+	  {sapl_fun="gtI",arity=2,data_cons=Nothing,ext_fun=Just "_gt",inline_exp=Just ":!1: > :!2:"},
+	  {sapl_fun="gtR",arity=2,data_cons=Nothing,ext_fun=Just "_gt",inline_exp=Just ":!1: > :!2:"},
+	  {sapl_fun="gtC",arity=2,data_cons=Nothing,ext_fun=Just "_gt",inline_exp=Just ":!1: > :!2:"},
+	  {sapl_fun="geI",arity=2,data_cons=Nothing,ext_fun=Just "_ge",inline_exp=Just ":!1: >= :!2:"},
+	  {sapl_fun="geR",arity=2,data_cons=Nothing,ext_fun=Just "_ge",inline_exp=Just ":!1: >= :!2:"},
+	  {sapl_fun="geC",arity=2,data_cons=Nothing,ext_fun=Just "_ge",inline_exp=Just ":!1: >= :!2:"},
+	  {sapl_fun="ltI",arity=2,data_cons=Nothing,ext_fun=Just "_lt",inline_exp=Just ":!1: < :!2:"},
+	  {sapl_fun="ltR",arity=2,data_cons=Nothing,ext_fun=Just "_lt",inline_exp=Just ":!1: < :!2:"},
+	  {sapl_fun="ltC",arity=2,data_cons=Nothing,ext_fun=Just "_lt",inline_exp=Just ":!1: < :!2:"},
+	  {sapl_fun="ltS",arity=2,data_cons=Nothing,ext_fun=Just "_lt",inline_exp=Just ":!1: < :!2:"},
+	  {sapl_fun="not",arity=1,data_cons=Nothing,ext_fun=Just "_not",inline_exp=Just "!:!1:"},
+	  {sapl_fun="and",arity=2,data_cons=Nothing,ext_fun=Just "_and",inline_exp=Just ":!1: && :!2:"},
+	  {sapl_fun="or",arity=2,data_cons=Nothing,ext_fun=Just "_or",inline_exp=Just ":!1: || :!2:"},
+	  {sapl_fun="I2S",arity=1,data_cons=Nothing,ext_fun=Just "_toString",inline_exp=Just ":!1: + \"\""},
+	  {sapl_fun="C2S",arity=1,data_cons=Nothing,ext_fun=Just "_toString",inline_exp=Just ":!1: + \"\""},
+	  {sapl_fun="R2S",arity=1,data_cons=Nothing,ext_fun=Just "_toString",inline_exp=Just ":!1: + \"\""},
+	  {sapl_fun="string_size",arity=1,data_cons=Nothing,ext_fun=Just "_string_size",inline_exp=Just ":!1:.length"},
+	  {sapl_fun="string_usize",arity=1,data_cons=Nothing,ext_fun=Just "_string_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length,:1:]"},
+	  {sapl_fun="string_select",arity=2,data_cons=Nothing,ext_fun=Just "_string_select",inline_exp=Just ":!1:.charAt(:!2:)"},
+	  {sapl_fun="string_uselect",arity=2,data_cons=Nothing,ext_fun=Just "_string_uselect",inline_exp=Just "[0, '_Tuple2',:!1:.charAt(:!2:),:1:]"},
+	  {sapl_fun="string_create1",arity=1,data_cons=Nothing,ext_fun=Just "_string_create1$eval",inline_exp=Just "_string_create1(:!1:)"},
+	  {sapl_fun="string_create2",arity=2,data_cons=Nothing,ext_fun=Just "_string_create2$eval",inline_exp=Just "_string_create2(:!1:,:!2:)"},
+	  {sapl_fun="string_update",arity=3,data_cons=Nothing,ext_fun=Just "_string_update",inline_exp=Just ":!1:.replaceAt(:!2:,:!3:)"},
+	  {sapl_fun="string_update_copy",arity=3,data_cons=Nothing,ext_fun=Just "_string_update",inline_exp=Just ":!1:.replaceAt(:!2:,:!3:)"},
+	  {sapl_fun="string_slice",arity=3,data_cons=Nothing,ext_fun=Just "_string_slice",inline_exp=Just ":!1:.substr(:!2:,(:!3: - :!2: + 1))"},
+	  {sapl_fun="string_append",arity=2,data_cons=Nothing,ext_fun=Just "_string_append",inline_exp=Just ":!1: + :!2:"},
+	  {sapl_fun="string_replace",arity=3,data_cons=Nothing,ext_fun=Just "_string_replace$eval",inline_exp=Just "_string_replace(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="C2I",arity=1,data_cons=Nothing,ext_fun=Just "_toInt_char",inline_exp=Just ":!1:.charCodeAt(0)"},
+	  {sapl_fun="S2I",arity=1,data_cons=Nothing,ext_fun=Just "_toInt_str",inline_exp=Just "parseInt(:!1:)"},
+	  {sapl_fun="R2I",arity=1,data_cons=Nothing,ext_fun=Just "_toInt_real",inline_exp=Just "Math.floor(:!1:)"},
+	  {sapl_fun="I2R",arity=1,data_cons=Nothing,ext_fun=Just "_toReal",inline_exp=Just "parseFloat(:!1:)"},
+	  {sapl_fun="R2R",arity=1,data_cons=Nothing,ext_fun=Just "_toReal",inline_exp=Just "parseFloat(:!1:)"},
+	  {sapl_fun="S2R",arity=1,data_cons=Nothing,ext_fun=Just "_toReal",inline_exp=Just "parseFloat(:!1:)"},
+	  {sapl_fun="I2C",arity=1,data_cons=Nothing,ext_fun=Just "_toChar",inline_exp=Just "String.fromCharCode(:!1:)"},
+	  {sapl_fun="bitand",arity=2,data_cons=Nothing,ext_fun=Just "_bitand",inline_exp=Just ":!1: & :!2:"},
+	  {sapl_fun="bitor",arity=2,data_cons=Nothing,ext_fun=Just "_bitor",inline_exp=Just ":!1: | :!2:"},
+	  {sapl_fun="bitxor",arity=2,data_cons=Nothing,ext_fun=Just "_bitor",inline_exp=Just ":!1: ^ :!2:"},
+	  {sapl_fun="bitnot",arity=1,data_cons=Nothing,ext_fun=Just "_bitnot",inline_exp=Just "~ :!1:"},
+	  {sapl_fun="shiftleft",arity=2,data_cons=Nothing,ext_fun=Just "_shiftleft",inline_exp=Just ":!1: << :!2:"},
+	  {sapl_fun="shiftright",arity=2,data_cons=Nothing,ext_fun=Just "_shiftright",inline_exp=Just ":!1: >>> :!2:"},
+	  {sapl_fun="array_create1",arity=1,data_cons=Nothing,ext_fun=Just "_array_create1$eval",inline_exp=Just "_array_create1(:!1:)"},
+	  {sapl_fun="array_create1_lazy",arity=1,data_cons=Nothing,ext_fun=Just "_array_create1$eval",inline_exp=Just "_array_create1(:!1:)"},
+	  {sapl_fun="array_create1_B_I",arity=1,data_cons=Nothing,ext_fun=Just "_array_create1$eval",inline_exp=Just "_array_create1(:!1:)"},
+	  {sapl_fun="array_create1_B_R",arity=1,data_cons=Nothing,ext_fun=Just "_array_create1$eval",inline_exp=Just "_array_create1(:!1:)"},
+	  {sapl_fun="array_create1_B_B",arity=1,data_cons=Nothing,ext_fun=Just "_array_create1$eval",inline_exp=Just "_array_create1(:!1:)"},
+	  {sapl_fun="array_create2",arity=2,data_cons=Nothing,ext_fun=Just "_array_create2$eval",inline_exp=Just "_array_create2(:!1:,:!2:)"},
+	  {sapl_fun="array_create2_B_I",arity=2,data_cons=Nothing,ext_fun=Just "_array_create2$eval",inline_exp=Just "_array_create2(:!1:,:!2:)"},
+	  {sapl_fun="array_create2_B_R",arity=2,data_cons=Nothing,ext_fun=Just "_array_create2$eval",inline_exp=Just "_array_create2(:!1:,:!2:)"},
+	  {sapl_fun="array_create2_B_B",arity=2,data_cons=Nothing,ext_fun=Just "_array_create2$eval",inline_exp=Just "_array_create2(:!1:,:!2:)"},
+	  {sapl_fun="array_create2_lazy",arity=2,data_cons=Nothing,ext_fun=Just "_array_create2_lazy$eval",inline_exp=Just "_array_create2(:!1:,:2:)"},
+	  {sapl_fun="array_update_lazy",arity=3,data_cons=Nothing,ext_fun=Just "_array_update_lazy$eval",inline_exp=Just "_array_update(:!1:,:!2:,:3:)"},
+	  {sapl_fun="array_update",arity=3,data_cons=Nothing,ext_fun=Just "_array_update$eval",inline_exp=Just "_array_update(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_update_B_I",arity=3,data_cons=Nothing,ext_fun=Just "_array_update$eval",inline_exp=Just "_array_update(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_update_B_R",arity=3,data_cons=Nothing,ext_fun=Just "_array_update$eval",inline_exp=Just "_array_update(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_update_B_B",arity=3,data_cons=Nothing,ext_fun=Just "_array_update$eval",inline_exp=Just "_array_update(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_replace_lazy",arity=3,data_cons=Nothing,ext_fun=Just "_array_replace_lazy$eval",inline_exp=Just "_array_replace(:!1:,:!2:,:3:)"},
+	  {sapl_fun="array_replace",arity=3,data_cons=Nothing,ext_fun=Just "_array_replace$eval",inline_exp=Just "_array_replace(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_replace_B_I",arity=3,data_cons=Nothing,ext_fun=Just "_array_replace$eval",inline_exp=Just "_array_replace(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_replace_B_R",arity=3,data_cons=Nothing,ext_fun=Just "_array_replace$eval",inline_exp=Just "_array_replace(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_replace_B_B",arity=3,data_cons=Nothing,ext_fun=Just "_array_replace$eval",inline_exp=Just "_array_replace(:!1:,:!2:,:!3:)"},
+	  {sapl_fun="array_select_lazy",arity=2,data_cons=Nothing,ext_fun=Just "_array_select_lazy",inline_exp=Just "Sapl.feval(:!1:[:!2:+2])"},
+	  {sapl_fun="array_select",arity=2,data_cons=Nothing,ext_fun=Just "_array_select",inline_exp=Just ":!1:[:!2:+2]"},
+	  {sapl_fun="array_select_B_I",arity=2,data_cons=Nothing,ext_fun=Just "_array_select",inline_exp=Just ":!1:[:!2:+2]"},
+	  {sapl_fun="array_select_B_R",arity=2,data_cons=Nothing,ext_fun=Just "_array_select",inline_exp=Just ":!1:[:!2:+2]"},
+	  {sapl_fun="array_select_B_B",arity=2,data_cons=Nothing,ext_fun=Just "_array_select",inline_exp=Just ":!1:[:!2:+2]"},
+	  {sapl_fun="array_uselect_lazy",arity=2,data_cons=Nothing,ext_fun=Just "_array_uselect",inline_exp=Just "[0, '_Tuple2',:!1:[:!2:+2],:1:]"},
+	  {sapl_fun="array_uselect",arity=2,data_cons=Nothing,ext_fun=Just "_array_uselect",inline_exp=Just "[0, '_Tuple2',:!1:[:!2:+2],:1:]"},
+	  {sapl_fun="array_uselect_B_I",arity=2,data_cons=Nothing,ext_fun=Just "_array_uselect",inline_exp=Just "[0, '_Tuple2',:!1:[:!2:+2],:1:]"},
+	  {sapl_fun="array_uselect_B_B",arity=2,data_cons=Nothing,ext_fun=Just "_array_uselect",inline_exp=Just "[0, '_Tuple2',:!1:[:!2:+2],:1:]"},
+	  {sapl_fun="array_uselect_B_R",arity=2,data_cons=Nothing,ext_fun=Just "_array_uselect",inline_exp=Just "[0, '_Tuple2',:!1:[:!2:+2],:1:]"},
+	  {sapl_fun="array_size_lazy",arity=1,data_cons=Nothing,ext_fun=Just "_array_size",inline_exp=Just ":!1:.length-2"},
+	  {sapl_fun="array_size",arity=1,data_cons=Nothing,ext_fun=Just "_array_size",inline_exp=Just ":!1:.length-2"},
+	  {sapl_fun="array_size_B_I",arity=1,data_cons=Nothing,ext_fun=Just "_array_size",inline_exp=Just ":!1:.length-2"},
+	  {sapl_fun="array_size_B_B",arity=1,data_cons=Nothing,ext_fun=Just "_array_size",inline_exp=Just ":!1:.length-2"},
+	  {sapl_fun="array_size_B_R",arity=1,data_cons=Nothing,ext_fun=Just "_array_size",inline_exp=Just ":!1:.length-2"},
+	  {sapl_fun="array_usize_lazy",arity=1,data_cons=Nothing,ext_fun=Just "_array_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length-2,:1:]"},
+	  {sapl_fun="array_usize",arity=1,data_cons=Nothing,ext_fun=Just "_array_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length-2,:1:]"},
+	  {sapl_fun="array_usize_B_I",arity=1,data_cons=Nothing,ext_fun=Just "_array_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length-2,:1:]"},
+	  {sapl_fun="array_usize_B_B",arity=1,data_cons=Nothing,ext_fun=Just "_array_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length-2,:1:]"},
+	  {sapl_fun="array_usize_B_R",arity=1,data_cons=Nothing,ext_fun=Just "_array_usize",inline_exp=Just "[0, '_Tuple2',:!1:.length-2,:1:]"},
+	  {sapl_fun="abort",arity=1,data_cons=Nothing,ext_fun=Just "_abort",inline_exp=Nothing},
+	  {sapl_fun="error",arity=1,data_cons=Nothing,ext_fun=Just "_error",inline_exp=Nothing},
+	  {sapl_fun="tupsels1v0",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels1v0",inline_exp=Just "Sapl.feval(:!1:[2])"},
+	  {sapl_fun="tupsels2v0",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels2v0",inline_exp=Just "Sapl.feval(:!1:[2])"},
+	  {sapl_fun="tupsels2v1",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels2v1",inline_exp=Just "Sapl.feval(:!1:[3])"},
+	  {sapl_fun="tupsels3v0",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels3v0",inline_exp=Just "Sapl.feval(:!1:[2])"},
+	  {sapl_fun="tupsels3v1",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels3v1",inline_exp=Just "Sapl.feval(:!1:[3])"},
+	  {sapl_fun="tupsels3v2",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels3v2",inline_exp=Just "Sapl.feval(:!1:[4])"},
+	  {sapl_fun="tupsels4v0",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels4v0",inline_exp=Just "Sapl.feval(:!1:[2])"},
+	  {sapl_fun="tupsels4v1",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels4v1",inline_exp=Just "Sapl.feval(:!1:[3])"},
+	  {sapl_fun="tupsels4v2",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels4v2",inline_exp=Just "Sapl.feval(:!1:[4])"},
+	  {sapl_fun="tupsels4v3",arity=1,data_cons=Nothing,ext_fun=Just "_tupsels4v3",inline_exp=Just "Sapl.feval(:!1:[5])"}
+   ]}

src/Sapl/Target/Flavour.dcl

@@ -43,9 +43,29 @@ from Data.Set import :: Set
 			 */		     		     
 		     , inlineFunctions  :: Map String InlineFunDef
 			 }
+
+//Serialized representation
+:: FlavourRep = { fun_prefix  :: String
+				, options	  :: [String]
+		        , bifs        :: [BIFRep]
+			    }
+	
+:: BIFRep = { sapl_fun   :: String
+			// number of arguments
+            , arity      :: Int
+            // custom data constructor? (always inlined)
+            , data_cons	 :: Maybe Bool 
+            // JavaScript function name, if the expression cannot be inloined
+            , ext_fun    :: Maybe String
+            // JavaScript expression if inlinement is possible:
+            // the expression is at strict position and saturated
+            , inline_exp  :: Maybe String
+            }
          
 toFlavour :: !String -> Maybe Flavour
 
+fromFlavourRep :: !FlavourRep -> Flavour
+
 // Check if a given flag is set or not in the flavour file
 isSet :: !Flavour !String -> Bool
 

src/Sapl/Target/Flavour.icl

 implementation module Sapl.Target.Flavour
 
 import StdList, StdFunc, StdArray
-import Data.Maybe, Text.JSON, Text.StringAppender
+import Data.Maybe, Data.Functor, Text.JSON, Text.StringAppender
 import Sapl.SaplParser
 
 from Data.Set import qualified fromList, member
 import qualified Data.Map as DM
-
-:: FlavourRep = { fun_prefix  :: String
-				, options	  :: [String]
-		        , bifs        :: [BIFRep]
-			    }
-	
-:: BIFRep = { sapl_fun   :: String
-			// number of arguments
-            , arity      :: Int
-            // custom data constructor? (always inlined)
-            , data_cons	 :: Maybe Bool 
-            // JavaScript function name, if the expression cannot be inloined
-            , ext_fun    :: Maybe String
-            // JavaScript expression if inlinement is possible:
-            // the expression is at strict position and saturated
-            , inline_exp  :: Maybe String
-            }
-            
+           
 derive JSONEncode FlavourRep, BIFRep
 derive JSONDecode FlavourRep, BIFRep
 
@@ -46,20 +29,15 @@ where
 	revstr ss = toString (reverse ss)
 
 toFlavour :: !String -> Maybe Flavour
-toFlavour str 
-	= case mbRep of
-		Nothing  = Nothing
-		Just rep = Just (toFlavour` rep)
-where
-	mbRep :: Maybe FlavourRep
-	mbRep = fromJSON (fromString str)
-	
-	toFlavour` rep 
+toFlavour str = fmap fromFlavourRep (fromJSON (fromString str))
+
+fromFlavourRep :: !FlavourRep -> Flavour
+fromFlavourRep rep 
 		= { fun_prefix = rep.FlavourRep.fun_prefix
 		  , options = 'Data.Set'.fromList rep.FlavourRep.options
 		  , builtInFunctions = builtInFunctions
 		  , inlineFunctions = inlineFunctions}  
-	where
+where
 		bifs = filter (\f -> isJust f.ext_fun) rep.bifs
 		bifList = map (\f -> (f.sapl_fun, (fromJust f.ext_fun, f.BIFRep.arity))) bifs
 		builtInFunctions = 'DM'.fromList bifList
@@ -97,4 +75,4 @@ isSet f opt = 'Data.Set'.member opt f.Flavour.options
 
 
 
-			
\ No newline at end of file
+			

src/Sapl/Target/JS/CodeGeneratorJS.icl

@@ -50,7 +50,7 @@ newState f tramp p =
 			 , cs_builtins		= f.builtInFunctions
 			 , cs_inlinefuncs	= f.inlineFunctions
 			 , cs_trampoline    = tramp
-			 , cs_prefix        = f.fun_prefix
+			 , cs_prefix        = f.Flavour.fun_prefix
 			 }
 
 pushArgs :: !CoderState ![SaplTypedVar] -> CoderState
@@ -431,7 +431,7 @@ where
 			= constructorInliner t constructor [] s a	
 				
 		// custom data constructors can be inlined even at non-strict position
-		| isJust mbInlineFun && inlineFun.data_cons && inlineFun.arity == 0
+		| isJust mbInlineFun && inlineFun.InlineFunDef.data_cons && inlineFun.InlineFunDef.arity == 0
 			= a <++ "(" <++ inlineFun.fun (\t a = termCoder t s a) (\t a = forceTermCoder t s a) [] <++ ")"
 				
 		| isJust s.cs_inbody && not isLocalVar && isJust mbCAF
@@ -544,17 +544,17 @@ where
 			= forceApp (\a -> a <++ forceTermCoder (SApplication (SVar name) (take functionArity args)) s <++ ",[" 
 							 <++ termArrayCoder (drop functionArity args) "," {s & cs_intrfunc = Nothing} <++ "]") a
 				
-		| isJust mbInlineFun && inlineFun.arity == length args
+		| isJust mbInlineFun && inlineFun.InlineFunDef.arity == length args
 			= a <++ "(" <++ inlineFun.fun 
 				(\t a = termCoder t {s & cs_intrfunc = Nothing} a)
 				(\t a = forceTermCoder t {s & cs_intrfunc = Nothing} a) args <++ ")"
 
 		// more arguments than needed: split it
-		| isJust mbInlineFun && inlineFun.arity < length args
+		| isJust mbInlineFun && inlineFun.InlineFunDef.arity < length args
 			= forceApp (\a -> a <++ inlineFun.fun 
 										(\t a = termCoder t {s & cs_intrfunc = Nothing} a)
-										(\t a = forceTermCoder t {s & cs_intrfunc = Nothing} a) (take inlineFun.arity args) <++ ",[" 
-							 <++ termArrayCoder (drop inlineFun.arity args) "," {s & cs_intrfunc = Nothing} <++ "]") a
+										(\t a = forceTermCoder t {s & cs_intrfunc = Nothing} a) (take inlineFun.InlineFunDef.arity args) <++ ",[" 
+							 <++ termArrayCoder (drop inlineFun.InlineFunDef.arity args) "," {s & cs_intrfunc = Nothing} <++ "]") a
 							 
 		// BINs return no thunk, there is no need for feval even in trampolining
 		// no prefix for built-in functions
@@ -651,7 +651,7 @@ where
 		| isJust mbConstructor && constructor.nr_args == length args
 			= constructorInliner name constructor args s a	
 
-		| isJust mbInlineFun && inlineFun.arity == length args
+		| isJust mbInlineFun && inlineFun.InlineFunDef.arity == length args
 			= a <++ "(" <++ inlineFun.fun 
 				(\t a = termCoder t {s & cs_intrfunc = Nothing} a)
 				(\t a = forceTermCoder t {s & cs_intrfunc = Nothing} a) args <++ ")"
@@ -736,7 +736,7 @@ where
 			= constructorInliner name constructor args s a	
 		
 		// custom data constructors can be inlined even at non-strict position
-		| isJust mbInlineFun && inlineFun.data_cons && inlineFun.arity == length args
+		| isJust mbInlineFun && inlineFun.InlineFunDef.data_cons && inlineFun.InlineFunDef.arity == length args
 			= a <++ "(" <++ inlineFun.fun 
 				(\t a = termCoder t {s & cs_intrfunc = Nothing} a)
 				(\t a = forceTermCoder t {s & cs_intrfunc = Nothing} a) args <++ ")"