Generate preconditions (#16)

Cloogle @ 393afb03

-Subproject commit 23b05936be80efc2d30df8c09d347bc04754655d
+Subproject commit 393afb033911087478d932ab02236203a77849ed

Makefile

@@ -5,8 +5,9 @@ CLMFLAGS:=-nr -nt -h 100m -nortsopts\
 	-IL Platform\
 	-I Cloogle\
 	-I Cloogle/libcloogle\
-	-I Cloogle/CleanTypes\
 	-I Cloogle/CleanPrettyPrint\
+	-I Cloogle/CleanRegex\
+	-I Cloogle/CleanTypes\
 	-I Cloogle/clean-compiler/frontend\
 	-I Cloogle/clean-compiler/backend\
 	-I Cloogle/clean-compiler/main\

makecleantest.icl

@@ -302,7 +302,7 @@ where
 generateProperties :: ![PropertyVarInstantiation] ![NamedTestGenerator]
 	!LocationInModule !FunctionEntry -> [GeneratedProperty]
 generateProperties pvis generators loc fe=:{fe_documentation=Just doc} =
-	[gen i (fromJust loc.LocationInModule.name) p config
+	[gen i (fromJust loc.LocationInModule.name) doc.preconditions p config
 		\\ p <- doc.properties
 		, config <- configurations $ groupInstantiations $ pvis ++ docPropertyTestWith doc
 		& i <- [1..]]
@@ -314,8 +314,8 @@ where
 	configurations [vis:viss] = [[vi`:vis`] \\ vi` <- vis, vis` <- configurations viss]
 	configurations [] = [[]]
 
-	gen :: !Int !String !Property ![(String,Type)] -> GeneratedProperty
-	gen i fname (ForAll name ts imp) vis =
+	gen :: !Int !String ![String] !Property ![(String,Type)] -> GeneratedProperty
+	gen i fname preconditions (ForAll name ts imp) vis =
 		{ gp_name = tname
 		, gp_implementation = join "\n"
 			[ tname +++ " :: Property"
@@ -323,7 +323,11 @@ where
 			, "\t(" +++ lambda +++ join " " [name`` +++ "`":map snd3 ts`] +++ ")"
 			, "where"
 			, "\t" +++ name`` +++ "` :: " +++ toString type`
-			, "\t" +++ join " " [name`` +++ "`":map fst3 ts`] +++ " = prop _p\n\twhere\n\t\t_p = " +++ replaceSubString "\n" "\n\t\t\t" imp
+			, "\t" +++ join " " [name`` +++ "`":map fst3 ts`] +++ " = prop _p"
+			, "\twhere"
+			, "\t\t_p = (True" +++ concat [" /\\ _pre" <+ i \\ i <- [1..] & pre <- preconditions] +++ ") ==> _p`"
+			, "\t\t_p` = " +++ replaceSubString "\n" "\n\t\t\t" imp
+			: ["\t\t_pre" <+ i <+ " = " +++ s \\ s <- preconditions & i <- [1..]]
 			]
 		}
 	where