20220629 typed language

Cargo.toml

@@ -31,7 +31,7 @@ indoc = "1.0"
 do-notation = "0.1.3"
 serde_json = "1.0"
 sha2 = "0.9.5"
-tempfile = "3.3.0"
+tempfile = "3.10.1"
 clvmr = { version = "0.3.2", features = ["pre-eval"] }
 binascii = "0.1.4"
 yaml-rust = "0.4"
@@ -51,6 +51,7 @@ optional = true
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 lfsr = "0.3.0"
+ctor = "0.2.7"
 
 [lib]
 name = "clvm_tools_rs"

resources/tests/strict/typesmoke-lambda-anno.clsp

@@ -0,0 +1,8 @@
+(mod ((X : Atom) (Y : Atom)) -> Atom
+  (include *standard-cl-23*)
+  (defun plus-n ((N : Atom)) -> (Exec ((Pair Atom Unit) -> Atom))
+    (lambda ((& N) Y) (+ N Y))
+    )
+
+  (a (plus-n X) (list Y))
+  )

resources/tests/strict/typesmoke-lambda.clsp

@@ -0,0 +1,9 @@
+(mod ((X : (Pair Atom Unit))) -> (Pair Atom Any)
+  (include *standard-cl-23*)
+  (deftype T (x))
+  (assign
+    x_of_t (get_T_x (new_T X))
+    lam (a (lambda (Y) (+ Y 1)) (list x_of_t))
+    (c x_of_t lam)
+    )
+  )

resources/tests/strict/typesmoke.clsp

@@ -0,0 +1,5 @@
+(mod ((X : (Pair Atom Unit))) -> Atom
+  (include *standard-cl-23*)
+  (deftype T (x))
+  (get_T_x (new_T X))
+  )

src/classic/bins/repl.rs

@@ -1,7 +1,6 @@
 extern crate clvmr as clvm_rs;
 
 use std::io::{self, BufRead, Write};
-
 use std::rc::Rc;
 
 use clvm_rs::allocator::Allocator;

src/classic/clvm_tools/clvmc.rs

@@ -23,6 +23,7 @@ use crate::compiler::dialect::detect_modern;
 use crate::compiler::optimize::maybe_finalize_program_via_classic_optimizer;
 use crate::compiler::runtypes::RunFailure;
 use crate::compiler::srcloc::Srcloc;
+use crate::compiler::untype::untype_code;
 use crate::util::gentle_overwrite;
 
 #[derive(Debug, Clone)]
@@ -92,6 +93,7 @@ pub fn compile_clvm_text_maybe_opt(
 ) -> Result<NodePtr, CompileError> {
     let ir_src = read_ir(text).map_err(|s| EvalErr(allocator.null(), s.to_string()))?;
     let assembled_sexp = assemble_from_ir(allocator, Rc::new(ir_src))?;
+    let untyped_sexp = untype_code(allocator, Srcloc::start(input_path), assembled_sexp)?;
 
     let dialect = detect_modern(allocator, assembled_sexp);
     // Now the stepping is optional (None for classic) but we may communicate
@@ -118,7 +120,7 @@ pub fn compile_clvm_text_maybe_opt(
         Ok(convert_to_clvm_rs(allocator, res)?)
     } else {
         let compile_invoke_code = run(allocator);
-        let input_sexp = allocator.new_pair(assembled_sexp, allocator.null())?;
+        let input_sexp = allocator.new_pair(untyped_sexp, allocator.null())?;
         let run_program = run_program_for_search_paths(input_path, &opts.get_search_paths(), false);
         if classic_with_opts {
             run_program.set_compiler_opts(Some(opts));