tests

apps/builder/Builder.dib

@@ -96,7 +96,7 @@ let inline persistCodeProject packages modules name hash code = async {
     let workspaceRoot = SpiralFileSystem.get_workspace_root ()
 
     let targetDir =
-        let targetDir = workspaceRoot </> "target/polyglot/builder" </> name
+        let targetDir = workspaceRoot </> "target/Builder" </> name
         match hash with
         | Some hash -> targetDir </> "packages" </> hash
         | None -> targetDir

apps/plot/plot.rs

@@ -82,7 +82,7 @@ fn draw_line_plot(
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let workspace_root = plot::SpiralFileSystem::get_workspace_root();
     let workspace_root = std::path::PathBuf::from(workspace_root.to_string());
-    let tmp_spiral_dir = workspace_root.join("target/polyglot/plotting");
+    let tmp_spiral_dir = workspace_root.join("target/plot");
     let line_plots_data_dir = tmp_spiral_dir.join("line_data");
     let line_plots_svg_dir = tmp_spiral_dir.join("line_svg");
 

apps/spiral/Eval.dib

@@ -130,7 +130,7 @@ let inline mapErrors (severity, errors, lastTopLevelIndex) allCode =
 #!fsharp
 
 let workspaceRoot = SpiralFileSystem.get_workspace_root ()
-let targetDir = workspaceRoot </> "target/polyglot/spiral_eval"
+let targetDir = workspaceRoot </> "target/spiral_Eval"
 [ targetDir ]
 |> List.iter (fun dir -> if Directory.Exists dir |> not then Directory.CreateDirectory dir |> ignore)
 

apps/spiral/Supervisor.dib

@@ -373,7 +373,7 @@ let inline buildFile timeout port cancellationToken path = async {
 #!fsharp
 
 let inline persistCode code = async {
-    let targetDir = workspaceRoot </> "target/polyglot/spiral_eval"
+    let targetDir = workspaceRoot </> "target/spiral_Eval"
 
     let packagesDir = targetDir </> "packages"
 

apps/spiral/builder/spiral_builder.dib

@@ -184,7 +184,7 @@ inl persist_code_project packages modules name hash code =
 
     inl workspace_root = file_system.get_workspace_root ()
     inl target_dir =
-        inl target_dir = workspace_root </> "target/polyglot/spiral_builder" </> name
+        inl target_dir = workspace_root </> "target/spiral_builder" </> name
         match hash with
         | Some hash => target_dir </> "packages" </> hash
         | None => target_dir

lib/fsharp/Plotting.dib

@@ -37,7 +37,7 @@ open SpiralFileSystem.Operators
 #!fsharp
 
 let workspaceRoot = SpiralFileSystem.get_workspace_root ()
-let tmpSpiralPath = workspaceRoot </> "target/polyglot/plotting"
+let tmpSpiralPath = workspaceRoot </> "target/plot"
 let linePlotsDataPath = tmpSpiralPath </> "line_data"
 let linePlotsSvgPath = tmpSpiralPath </> "line_svg"
 

lib/spiral/am'.dib

@@ -18,7 +18,7 @@ open rust_operators
 
 #!markdown
 
-## types ()
+## types
 
 #!spiral
 
@@ -725,12 +725,10 @@ inl any forall t. (fn : t -> bool) (source : array_base t) : bool =
 
 #!spiral
 
-open iter_prototypes
-
-instance iter_collect vec = fun (iter : iter_prototypes.into_iterator u) =>
+instance iter_collect vec = fun (iter : into_iterator u) =>
     !\($'"!iter.collect::<Vec<_>>()"')
 
-instance iter_collect'' vec = fun (iter : iter_prototypes.into_iterator (t (u v))) =>
+instance iter_collect'' vec = fun (iter : into_iterator (t (u v))) =>
     !\($'"!iter.collect::<Vec<_>>()"')
 
 #!markdown

lib/spiral/am'.spi

@@ -1,7 +1,7 @@
 /// # am'
 open rust_operators
 
-/// ## types ()
+/// ## types
 inl types () =
     global "#if FABLE_COMPILER\n[<Fable.Core.Erase; Fable.Core.Emit(\"[$0]\")>]\n#endif\ntype Slice<'T> = class end"
     global "#if FABLE_COMPILER\n[<Fable.Core.Erase; Fable.Core.Emit(\"_\")>]\n#endif\ntype Slice'<'T> = class end"
@@ -332,12 +332,10 @@ inl any forall t. (fn : t -> bool) (source : array_base t) : bool =
     !\($'"!source.any(|x| !fn(x))"')
 
 /// ## iter_collect vec
-open iter_prototypes
-
-instance iter_collect vec = fun (iter : iter_prototypes.into_iterator u) =>
+instance iter_collect vec = fun (iter : into_iterator u) =>
     !\($'"!iter.collect::<Vec<_>>()"')
 
-instance iter_collect'' vec = fun (iter : iter_prototypes.into_iterator (t (u v))) =>
+instance iter_collect'' vec = fun (iter : into_iterator (t (u v))) =>
     !\($'"!iter.collect::<Vec<_>>()"')
 
 /// ## new_vec

lib/spiral/am'_prototypes.spi

@@ -0,0 +1,3 @@
+/// ### array
+inl array x =
+    x