Make Sakura files a unified module with global scoping

Author: EduardoLR10

bin/main.ml

@@ -26,8 +26,10 @@ let run : cmd -> unit = function
   | Compile { files; run; log_level } ->
       Logger.Level.set_min_level log_level;
       check_extensions (BatSet.String.of_list [ ".krt"; ".skr"; ".pl" ]) files;
+      (* TODO: Make sakura module name as an available CLI option with db being the default *)
+      let cli : Compiler.Types.cli = { sakura_module_name = "db" } in
       let* _ =
-        Executor.compile
+        Executor.compile cli
           (fun name forms ->
             Erl.compile "runtime" name @@ BatFingerTree.to_list forms)
           files

lib/Error.ml

@@ -24,6 +24,12 @@ let error = error
 let ( ||> ) = bind
 let map = Result.map
 
+let fold (f : 'b list -> 'a -> 'b list attempt) (elements : 'a list) :
+    'b list attempt =
+  List.fold_left
+    (fun acc element -> Result.bind acc (Fun.flip f element))
+    (ok []) elements
+
 let ( let* ) o f =
   match o with
   | Error err ->

lib/Executor.ml

@@ -38,20 +38,29 @@ end
 module Sakura = struct
   let compile_clause = Sakura.compile_clause
 
-  module Lookup = Compiler.Lookup
+  module Lookup = Database.Lookup
 end
 
 type preprocessed_files = Ast.Clause.t BatFingerTree.t BatMap.String.t
 type preprocessed_result = Preprocessor.DependencyGraph.t * preprocessed_files
 
 (* FIXME: hook up dependency information and sort the file list before compiling *)
 (* TODO: compilation cache *)
-let compile (persist : Compiler.Types.Persist.t) (filepaths : string list) :
+let compile ({ sakura_module_name } : Compiler.Types.cli)
+    (persist : Compiler.Types.Persist.t) (filepaths : string list) :
     unit attempt =
+  let is_sakura_file filepath = Filename.extension filepath = ".skr" in
+  let sakura_filename = sakura_module_name ^ ".skr" in
+  let sakura_files, karuta_files = BatList.partition is_sakura_file filepaths in
+  let* sakura_output =
+    sakura_files
+    |> Error.fold (fun parsed filepath ->
+        parse filepath |> Error.map (List.append parsed))
+    ||> preprocess (Preprocessor.initialize sakura_filename)
+  in
   let compile_one_file (preprocessed : preprocessed_files) filepath externals =
-    let extension = Filename.extension filepath in
     let compiler_config =
-      if extension = ".skr" then
+      if is_sakura_file filepath then
         (module Sakura : Compiler.Types.COMPILER_CONFIG)
       else (module Karuta : Compiler.Types.COMPILER_CONFIG)
     in
@@ -78,18 +87,20 @@ let compile (persist : Compiler.Types.Persist.t) (filepaths : string list) :
   in
   let* dependency_graph, preprocessed_files =
     List.fold_left preprocess_one
-      (ok (Preprocessor.DependencyGraph.empty, BatMap.String.empty))
+      (ok
+         ( sakura_output.dependencies,
+           BatMap.String.singleton sakura_filename sakura_output.clauses ))
       filepaths
   in
   let* expanded_graph = Preprocessor.DependencyGraph.expand dependency_graph in
   let sorted_file_paths =
-    Preprocessor.DependencyGraph.sort expanded_graph filepaths
+    Preprocessor.DependencyGraph.sort expanded_graph karuta_files
   in
   let rec compile_all imports = function
     | [] -> Ok ()
     | f :: files ->
-        Result.bind (compile_one_file preprocessed_files f imports)
-          (fun result -> compile_all result.externals files)
+        let* result = compile_one_file preprocessed_files f imports in
+        compile_all result.externals files
   in
   compile_all BatMap.String.empty sorted_file_paths
 

lib/Parser.ml

@@ -456,6 +456,7 @@ and top_level : 'e. (Ast.ParserClause.t list, ([> expr_errors ] as 'e)) parser =
            @@ fun result -> skip_whitespace_and_comments @&& return result)
      @> replace @@ BatFingerTree.to_list
 
+(* TODO: Change output type of this to be a fingertree *)
 let parse (filepath : string) (source : string) =
   match
     {

lib/compiler/Lookup.ml

@@ -1,6 +1,5 @@
-open Types
+include Types
 
-type t = Types.t
 type 'a nested_env = 'a env BatLazyList.t
 type scope = comptime nested_env
 type sig_scope = signature nested_env
@@ -61,7 +60,7 @@ let empty_signature : sig_scope = BatLazyList.nil
 let sig_env_to_sig_scope (env : signature env) : sig_scope =
   BatLazyList.of_list [ env ]
 
-let sig_cons (scope : sig_scope) (env : Types.sig_env) : sig_scope =
+let sig_cons (scope : sig_scope) (env : sig_env) : sig_scope =
   BatLazyList.cons env scope
 
 let ancestors_of_compiler (compiler : t) : scope =

lib/compiler/Types.ml

@@ -89,6 +89,8 @@ module type LookupS = sig
     | `UnexpectedSignature of Location.location ]
 end
 
+type cli = { sakura_module_name : string }
+
 type t = {
   externals : comptime env;
   imports : BatSet.String.t;

lib/database/Lookup.ml

@@ -0,0 +1,7 @@
+include Compiler.Lookup
+
+let ancestors_of_compiler (compiler : t) : scope =
+  let open BatLazyList in
+  unfold (Some compiler) (function
+    | None -> None
+    | Some { parent; env; _ } -> Some (env.modules, parent))