Test: reading random zebra

icicle-lang · Feb 21, 2017 · 4117fe2 · 4117fe2
1 parent f55e317
commit 4117fe2
Show file tree

Hide file tree

Showing 7 changed files with 385 additions and 4 deletions.
diff --git a/data/sea/54-zebra.h b/data/sea/54-zebra.h
@@ -156,7 +156,7 @@ static int64_t zebra_translate_column
                 istring_t *strings = anemone_mempool_alloc (mempool, count * sizeof (istring_t));
                 int offset = 1;
                 for (int i = 0; i != count; ++i) {
-                    int64_t index = i + elem_start;
+                    int64_t index = i;
                     int64_t start = data.a.n[index]   - data.a.n[0];
                     int64_t len   = data.a.n[index+1] - data.a.n[index];
                     offset = zebra_translate_table (mempool, elem_start, len, (void**)(strings + i), &data.a.table);

diff --git a/icicle-compiler/icicle.cabal b/icicle-compiler/icicle.cabal
@@ -259,12 +259,14 @@ test-suite test
                      , ambiata-x-file-embed
                      , ambiata-anemone
                      , ambiata-zebra
+                     , ambiata-zebra-test
                      , bifunctors                      >= 4.2        && < 5.4
                      , bindings-DSL                    >= 1.0.0      && <= 1.0.23
                      , aeson
                      , bytestring
                      , containers
                      , directory
+                     , exceptions                      == 0.8.*
                      , filepath                        == 1.4.*
                      , geniplate-mirror                >= 0.7.2      && < 0.8
                      , megaparsec                      == 5.0.*
@@ -278,6 +280,7 @@ test-suite test
                      , temporary
                      , text
                      , transformers
+                     , vector                          == 0.11.*
 
 
 test-suite test-io

diff --git a/icicle-compiler/src/Icicle/Sea/Eval/Base.hs b/icicle-compiler/src/Icicle/Sea/Eval/Base.hs
@@ -37,6 +37,10 @@ module Icicle.Sea.Eval.Base (
   , withWords
   , pokeWordOff
   , peekWordOff
+
+  , peekOutputs
+  , wordOfError
+  , errorOfWord
   ) where
 
 import           Control.Monad.Catch (MonadMask(..))

diff --git a/icicle-compiler/src/Icicle/Sea/Fleet.hs b/icicle-compiler/src/Icicle/Sea/Fleet.hs
@@ -128,7 +128,7 @@ seaCreateFleet options cache input chords code = do
                     left . SeaExternalError . T.pack $ "error step: " <> show msg
                   else return ()
 
-            let puller' :: PullId -> EitherT SeaError IO (Maybe Block)
+            let puller' :: PullId -> EitherT SeaError IO (Maybe (Block ()))
                 puller' = firstEitherT (SeaExternalError . T.pack . show) . puller
 
             runEitherT