Preliminary support for generating test vectors.

generation/src/Base.hs

@@ -11,7 +11,8 @@ base :: File
 base = File {
   predicate = \ _ _ -> True,
   outputName = "base",
-  generator = declareBaseStructure
+  generator = declareBaseStructure,
+  testGenerator = Nothing
 }
 
 declareBaseStructure :: Word -> Gen ()

generation/src/BinaryOps.hs

@@ -11,7 +11,8 @@ binaryOps :: File
 binaryOps = File {
     predicate = \ _ _ -> True,
     outputName = "binary",
-    generator = declareBinaryOperators
+    generator = declareBinaryOperators,
+    testGenerator = Nothing
 }
 
 declareBinaryOperators :: Word -> Gen ()

generation/src/Compare.hs

@@ -9,7 +9,8 @@ comparisons :: File
 comparisons = File {
   predicate = \ _ _ -> True,
   outputName = "compare",
-  generator = declareComparators
+  generator = declareComparators,
+  testGenerator = Nothing
 }
 
 declareComparators :: Word -> Gen ()

generation/src/Conversions.hs

@@ -11,7 +11,8 @@ conversions :: File
 conversions = File {
   predicate = \ _ _ -> True,
   outputName = "conversions",
-  generator = declareConversions
+  generator = declareConversions,
+  testGenerator = Nothing
 }
 
 declareConversions :: Word -> Gen ()

generation/src/CryptoNum.hs

@@ -11,7 +11,8 @@ cryptoNum :: File
 cryptoNum = File {
   predicate = \ _ _ -> True,
   outputName = "cryptonum",
-  generator = declareCryptoNumInstance
+  generator = declareCryptoNumInstance,
+  testGenerator = Nothing
 }
 
 declareCryptoNumInstance :: Word -> Gen ()

generation/src/File.hs

@@ -2,7 +2,7 @@ module File(
          File(..),
          Task(..),
          addModuleTasks,
-         makeTask
+         makeTasks
        )
  where
 
@@ -15,7 +15,8 @@ import System.FilePath(takeBaseName,takeDirectory,takeFileName,(</>))
 data File = File {
     predicate :: Word -> [Word] -> Bool,
     outputName :: FilePath,
-    generator :: Word -> Gen ()
+    generator :: Word -> Gen (),
+    testGenerator :: Maybe (Word -> Gen ())
 }
 
 data Task = Task {
@@ -23,18 +24,18 @@ data Task = Task {
     fileGenerator :: Gen ()
 }
 
-makeTask :: FilePath ->
+makeTasks :: FilePath -> FilePath ->
             Word -> [Word] ->
             File ->
-            Maybe Task
+            [Task]
-makeTask base size allSizes file
+makeTasks srcBase testBase size allSizes file
   | predicate file size allSizes =
-     Just Task {
+      let base = Task (srcBase </> ("u" ++ show size) </> outputName file <> ".rs") (generator file size)
-         outputFile = base </> ("u" ++ show size) </> outputName file <> ".rs",
+      in case testGenerator file of 
-         fileGenerator = generator file size
+           Nothing -> [base]
-     }
+           Just x ->
-  | otherwise =
+            [base, Task (testBase </> outputName file </> ("U" ++ show size ++ ".test")) (x size)]
-     Nothing
+  | otherwise = []
 
 addModuleTasks :: FilePath -> [Task] -> [Task]
 addModuleTasks base baseTasks = unsignedTask : (baseTasks ++ moduleTasks)

generation/src/Main.hs

@@ -7,9 +7,8 @@ import Compare(comparisons)
 import Conversions(conversions)
 import CryptoNum(cryptoNum)
 import Control.Monad(forM_,unless)
-import Data.Maybe(mapMaybe)
 import Data.Word(Word)
-import File(File,Task(..),addModuleTasks,makeTask)
+import File(File,Task(..),addModuleTasks,makeTasks)
 import Gen(runGen)
 import System.Directory(createDirectoryIfMissing)
 import System.Environment(getArgs)
@@ -38,21 +37,24 @@ signedFiles :: [File]
 signedFiles = [
   ]
 
-makeTasks :: FilePath -> [File] -> [Task]
+makeTasks' :: FilePath -> FilePath -> [File] -> [Task]
-makeTasks basePath files =
+makeTasks' srcPath testPath files =
-  concatMap (\ sz -> mapMaybe (makeTask basePath sz bitsizes) files) bitsizes
+  concatMap (\ sz -> concatMap (makeTasks srcPath testPath sz bitsizes) files) bitsizes
 
-makeAllTasks :: FilePath -> [Task]
+makeAllTasks :: FilePath -> FilePath -> [Task]
-makeAllTasks basePath = addModuleTasks basePath $
+makeAllTasks srcPath testPath = addModuleTasks srcPath $
-  makeTasks (basePath </> "unsigned") unsignedFiles ++
+  makeTasks' (srcPath </> "unsigned") testPath unsignedFiles ++
-  makeTasks (basePath </> "signed")   signedFiles
+  makeTasks' (srcPath </> "signed")   testPath signedFiles
 
 main :: IO ()
 main =
   do args <- getArgs
      unless (length args == 1) $
        die ("generation takes exactly one argument, the target directory")
-     let tasks = makeAllTasks (head args)
+     let topLevel = head args
+         srcPath = topLevel </> "src"
+         testPath = topLevel </> "testdata"
+         tasks = makeAllTasks srcPath testPath
          total = length tasks
      forM_ (zip [(1::Word)..] tasks) $ \ (i, task) ->
        do putStrLn ("[" ++ show i ++ "/" ++ show total ++ "] " ++ outputFile task)