Merge pull request #251 from HigherOrderCO/feature/sc-512/add-tests-f…

…or-file-builtin-functions

[sc-512] Add tests for file builtin functions

src/builtins/mod.rs

@@ -8,7 +8,7 @@ use hvmc::{ast, host::Host, stdlib::LogDef};
 use crate::{
   readback_hvmc,
   term::{
-    builtins::{SCONS, SNIL},
+    builtins::{RESULT_ERR, RESULT_OK, SCONS, SNIL},
     term_to_net::Labels,
     AdtEncoding, Book, Term,
   },
@@ -27,7 +27,8 @@ pub mod util;
 pub const CORE_BUILTINS: [&str; 7] =
   ["HVM.log", "HVM.black_box", "HVM.print", "HVM.query", "HVM.store", "HVM.load", "HVM.exit"];
 /// List of definition names used by the core builtins
-pub const CORE_BUILTINS_USES: [&[&str]; 7] = [&[], &[], &[], &[SCONS, SNIL], &[], &[], &[]];
+pub const CORE_BUILTINS_USES: [&[&str]; 7] =
+  [&[], &[], &[], &[SCONS, SNIL], &[RESULT_OK, RESULT_ERR], &[RESULT_OK, RESULT_ERR], &[]];
 
 /// Creates a host with the hvm-core primitive definitions built-in.
 /// This needs the book as an Arc because the closure that logs

src/lib.rs

@@ -1,7 +1,7 @@
 #![feature(box_patterns)]
 #![feature(let_chains)]
 
-use builtins::create_host;
+use builtins::{create_host, CORE_BUILTINS_USES};
 use diagnostics::{DiagnosticOrigin, Diagnostics, DiagnosticsConfig, Severity};
 use hvmc::{
   ast::Net,
@@ -63,7 +63,10 @@ pub fn compile_book(
     diagnostics.fatal(())?;
   }
   if opts.prune {
-    core_book.prune(&[book.hvmc_entrypoint().to_string()]);
+    let mut prune_entrypoints = vec![book.hvmc_entrypoint().to_string()];
+    let mut builtin_uses = CORE_BUILTINS_USES.concat().iter().map(|x| x.to_string()).collect::<Vec<_>>();
+    prune_entrypoints.append(&mut builtin_uses);
+    core_book.prune(&prune_entrypoints);
   }
   mutual_recursion::check_cycles(&core_book, &mut diagnostics)?;
 

tests/golden_tests.rs

@@ -357,3 +357,27 @@ fn mutual_recursion() {
     Ok(format!("{}{}", res.diagnostics, res.core_book))
   })
 }
+
+#[test]
+fn io() {
+  run_golden_test_dir_multiple(function_name!(), &[
+    (&|code, path| {
+      let book = do_parse_book(code, path)?;
+
+      let mut desugar_opts = CompileOpts::light();
+      desugar_opts.lazy_mode();
+
+      // 1 million nodes for the test runtime. Smaller doesn't seem to make it any faster
+      let (res, info) =
+        run_book(book, None, RunOpts::lazy(), desugar_opts, DiagnosticsConfig::default(), None)?;
+      Ok(format!("Lazy mode:\n{}{}", info.diagnostics, res))
+    }),
+    (&|code, path| {
+      let book = do_parse_book(code, path)?;
+
+      let (res, info) =
+        run_book(book, None, RunOpts::default(), CompileOpts::light(), DiagnosticsConfig::default(), None)?;
+      Ok(format!("Strict mode:\n{}{}", info.diagnostics, res))
+    }),
+  ])
+}

tests/golden_tests/io/load.hvm

@@ -0,0 +1,6 @@
+(Main) =
+  use path = "tests/golden_tests/io/load.txt"
+  (HVM.load path @result match result {
+    Result.ok: result.val;
+    Result.err: result.val;
+  })

tests/golden_tests/io/load.txt

@@ -0,0 +1 @@
+Contents

tests/golden_tests/io/load_fail.hvm

@@ -0,0 +1,6 @@
+(Main) =
+  use path = "tests/golden_tests/io/load_fail.txt"
+  (HVM.load path @result match result {
+    Result.ok: result.val;
+    Result.err: result.val;
+  })

tests/golden_tests/io/store.hvm

@@ -0,0 +1,6 @@
+(Main) =
+  use path = "tests/golden_tests/io/store.txt"
+  (HVM.store path "(Main) = 0" @result match result {
+    Result.ok: result.val;
+    Result.err: result.val;
+  })

tests/golden_tests/io/store.txt

@@ -0,0 +1 @@
+(Main) = 0

tests/golden_tests/io/store_fail.hvm

@@ -0,0 +1,6 @@
+(Main) =
+  use path = "tests/golden_tests/io/missing_dir/store_fail.txt"
+  (HVM.store path "(Main) = 0" @result match result {
+    Result.ok: result.val;
+    Result.err: result.val;
+  })

tests/snapshots/io__load.hvm.snap

@@ -0,0 +1,8 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/io/load.hvm
+---
+Lazy mode:
+"Contents\n"
+Strict mode:
+"Contents\n"

tests/snapshots/io__load_fail.hvm.snap

@@ -0,0 +1,8 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/io/load_fail.hvm
+---
+Lazy mode:
+"Filesystem error: No such file or directory (os error 2)"
+Strict mode:
+"Filesystem error: No such file or directory (os error 2)"

tests/snapshots/io__store.hvm.snap

@@ -0,0 +1,8 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/io/store.hvm
+---
+Lazy mode:
+*
+Strict mode:
+*

tests/snapshots/io__store_fail.hvm.snap

@@ -0,0 +1,8 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/io/store_fail.hvm
+---
+Lazy mode:
+"Filesystem error: No such file or directory (os error 2)"
+Strict mode:
+"Filesystem error: No such file or directory (os error 2)"