From d97c2e366a7b14db53b0107856499b7abd573af8 Mon Sep 17 00:00:00 2001 From: Brian Campbell Date: Wed, 23 Aug 2017 13:53:59 +0100 Subject: Update monomorphisation test script --- src/gen_lib/state.lem | 2 +- test/mono/test.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gen_lib/state.lem b/src/gen_lib/state.lem index 3cbcd4c8..736b8abc 100644 --- a/src/gen_lib/state.lem +++ b/src/gen_lib/state.lem @@ -205,7 +205,7 @@ val barrier : forall 'regs. barrier_kind -> M 'regs unit let barrier _ = return () val footprint : forall 'regs. M 'regs unit -let footprint = return () +let footprint s = return () s val foreachM_inc : forall 'regs 'vars 'e. (integer * integer * integer) -> 'vars -> diff --git a/test/mono/test.sh b/test/mono/test.sh index 153b09f8..0e2ad40b 100755 --- a/test/mono/test.sh +++ b/test/mono/test.sh @@ -30,9 +30,9 @@ while read -u 3 TEST ARGS; do echo "$TEST lem - ocaml" rm -f -- "$OUTDIR"/* "$SAILDIR/sail" -lem "$SAILDIR/lib/prelude.sail" "$DIR/$TEST".sail -o "$OUTDIR/testout" $ARGS $@ - "$LEMDIR/bin/lem" -ocaml -lib "$SAILDIR/src/lem_interp" "$SAILDIR/src/gen_lib/sail_values.lem" "$SAILDIR/src/gen_lib/state.lem" testout_embed_types.lem testout_embed_sequential.lem -outdir "$OUTDIR" + "$LEMDIR/bin/lem" -ocaml -lib "$SAILDIR/src/lem_interp" "$SAILDIR/src/gen_lib/sail_values.lem" "$SAILDIR/src/gen_lib/state.lem" testout_embed_types_sequential.lem testout_embed_sequential.lem -outdir "$OUTDIR" cp -- "$DIR"/test.ml "$OUTDIR" - ocamlc -I "$ZARITH" "$ZARITH/zarith.cma" -dllpath "$ZARITH" -I "$LEMDIR/ocaml-lib" "$LEMDIR/ocaml-lib/extract.cma" -I "$SAILDIR/src/_build/lem_interp" "$SAILDIR/src/_build/lem_interp/extract.cma" sail_values.ml state.ml testout_embed_types.ml testout_embed_sequential.ml test.ml -o test + ocamlc -I "$ZARITH" "$ZARITH/zarith.cma" -dllpath "$ZARITH" -I "$LEMDIR/ocaml-lib" "$LEMDIR/ocaml-lib/extract.cma" -I "$SAILDIR/src/_build/lem_interp" "$SAILDIR/src/_build/lem_interp/extract.cma" sail_values.ml state.ml testout_embed_types_sequential.ml testout_embed_sequential.ml test.ml -o test ./test fi done -- cgit v1.2.3