master is fine again

Author: TeamSPoon

hyperon-wam.vpj

@@ -308,9 +308,6 @@
 			N="*.*"
 			Recurse="1"
 			Excludes=".git/;*.metta.html;*.bak;build/;.*/;*~*/"/>
-		<F N="mymod.py"/>
-		<F N="rust_rand.py"/>
-		<F N="setup.py"/>
 		<F N="vvv_tests.pl"/>
 	</Files>
 </Project>

libraries/builtin_mods/builtins-fileio.metta

@@ -5,27 +5,26 @@
 ; the system level get-type is nondetermninistic therefore returns all willing participants 
 (= (get-type $obj)
    (call-for! FileHandle  ; call for returns the first argument
-	 (@ (atomic $obj) ; stream might return an error if obj is not atomic
-	 (stream $obj)))) ; if obj is a stream we are calling it a filehandle since prolog streams already support this api
+	 (atomic $obj) ; stream might return an error if obj is not atomic
+	 (stream $obj))) ; if obj is a stream we are calling it a filehandle since prolog streams already support this api
 
 (= (parse-mode $chars)
    (call-for! $mode
-	 (@ 
 	 (or
 	   (and (memberchk r $chars) (memberchk w $chars) (= $mode update))
 	   (and (memberchk a $chars) (= $mode append))
 	   (and (memberchk w $chars) (= $mode write))
 	   (and (memberchk r $chars) (= $mode read))
-	   (= $mode read)))))
+	   (= $mode read))))
 
 (= (handle-create-options $path $chars)
-   (call-unit!
-	 (@ (if-then (and (memberchk n $chars) (exists_file $path))
+   (call-unit
+	 (if-then (and (memberchk n $chars) (exists_file $path))
 	   (throw (error (file_exists_error $path))))
 	 (if-then (and (memberchk c $chars) (not (exists_file $path)))
 	   (setup_call_cleanup (open $path write $s) (close $s) true))
 	 (if-then (and (memberchk t $chars) (exists_file $path))
-	   (setup_call_cleanup (open $path write $s) (close $s) true)))))
+	   (setup_call_cleanup (open $path write $s) (close $s) true))))
 
 (@doc file-open!
   (@desc "Function takes path to the file and open options (r, w, c, a, t) both in form of string, creates filehandle and
@@ -40,12 +39,12 @@
 ; tells the compiler to return only the first successful clause
 (iz file-open! Deterministic)
 (= (file-open! $fpath $opt)
-   (call-for! $stream (@
+   (call-for! $stream 
 	 (string_chars $opt $chars)
 	 (any_to_atom $fpath $path)
 	 (= $mode (parse-mode $chars))
 	 (handle-create-options $path $chars)
-	 (open $path $mode $stream [ (type text) ]))))
+	 (open $path $mode $stream [ (type text) ])))
 (= (file-open-err! $path $opt)
    (call-for! $_err
 	 (format (string $msg)
@@ -61,7 +60,7 @@
   (@return "File's content"))
 (: file-read-to-string! (-> FileHandle String))
 (= (file-read-to-string! $stream)
-   (call-fn! read_string $stream $_ ))
+   (call-fn read_string $stream $_ ))
 
 (@doc file-write!
   (@desc "Function takes filehandle provided by file-open!, content to be written (string atom) and puts content into
@@ -72,9 +71,9 @@
   (@return "Unit atom"))
 (: file-write! (-> FileHandle String Unit))
 (= (file-write! $stream $content)
-   (call-unit! (,
+   (call-unit
 	 (write $stream $content)
-	 (flush_output $stream))))
+	 (flush_output $stream)))
 
 (@doc file-seek!
   (@desc "Function takes filehandle provided by file-open! and desired cursor position (number) and sets cursor to
@@ -85,8 +84,8 @@
   (@return "Unit atom"))
 (: file-seek! (-> FileHandle Number Unit))
 (= (file-seek! $stream $offset)
-   (call-unit!
-	 (@ (seek $stream $offset bof $_))))
+   (call-unit
+	 (seek $stream $offset bof $_)))
 
 (@doc file-read-exact!
   (@desc "Function takes filehandle provided by file-open! and desired number of bytes to read (number), reads content
@@ -119,11 +118,11 @@
   (@return "Unit atom"))
 (: file-close! (-> FileHandle Unit))
 (= (file-close! $stream)
-   (call-unit!
+   (call-unit
 	 (close $stream)))
 
 ; Load system libs (not required .. but more here for reference)
-;!(call-unit!
+;!(call-unit
 ;  (use_module (library apply))
 ;  (use_module (library filesex)))
 

libraries/builtin_mods/builtins-thread.metta

@@ -87,7 +87,7 @@
   (@return "Token (Token)"))
 (: thread:async-token! (-> Atom Variable Token))
 (= (thread:async-token! $eval $result)
-   (call-fn! async_eval_token $eval $result))
+   (call-fn async_eval_token $eval $result))
 
 (@doc thread:async-policy!
   (@desc "Starts an asynchronous operation with a policy and token as result.")
@@ -97,7 +97,7 @@
   (@return "Token (Token)"))
 (: thread:async-policy! (-> Atom Atom Token))
 (= (thread:async-policy! $eval $policy $token)
-   (call-for! $token
+   (call-for $token
 	 (async_thread_with_policy $eval $token $policy)))
 
 (@doc thread:await-token!
@@ -464,9 +464,7 @@
   (@param "Goal: Expression to evaluate")
   (@param "Options: Expression of (key value) pairs")))
   (@return "Engine handle"))
-(: engine:create (-> Atom EngineHandle))
-(= (engine:create $eval) (engine:create $eval ()))
-(: engine:create (-> Atom Expression EngineHandle))
+(: engine:create (-> %Undefined% Atom Expression EngineHandle))
 (= (engine:create $eval $options)
    (call-for! $handle (@ engine_create $template (@ eval_args $eval $template) $handle $options)))
 
@@ -552,7 +550,7 @@
 (= (engine-quick-tests)
    (let
       $E (engine:create (superpose (1 2 3)))
-	(progn
+	(do
        (println! ("Result 1: " (engine:next $E)))
        (println! ("Result 2: " (engine:next $E)))
        (println! ("Result 3: " (engine:next $E)))