Revert "super basic import"

This reverts commit ec59355.

Author: mkhan45

lib/preprocess.ml

@@ -260,25 +260,6 @@ let resolve_idents tree idents =
     let tree, _ = tree_fold_map tree ~accumulator:idents ~f:resolve_idents_step in
     tree
 
-(* To be replaced with a proper module system later *)
-let resolve_imports_step () node = match node with
-    | ExprNode {
-        data = 
-            LambdaCall {
-                callee = UnresolvedIdent "import"; 
-                call_args = 
-                    {data = TupleExpr [{data = Atomic (StringVal filename); _}]; _}
-            }; location} ->
-            let in_stream = Stdio.In_channel.create filename in
-            let in_string = Stdio.In_channel.input_all in_stream in
-            let file_block, _ = Parser.parse_str ("{" ^ in_string ^ "}") filename in
-            ExprNode file_block, ()
-    | _ -> node, ()
-
-let resolve_imports tree =
-    let tree, _ = tree_fold_map tree ~accumulator:() ~f:resolve_imports_step in
-    unwrap_expr_node tree
-
 let find_expr_functions ss acc e = match e with
     | FnDef {fn_name = UnresolvedIdent fn_name; fn_def_func} -> 
         (fn_name |> List.Assoc.find_exn ss.static_idents ~equal:String.equal, fn_def_func)::acc

lib/run.ml

@@ -44,16 +44,11 @@ let run_string in_string filename (ss, state) =
         List.rev (aux remaining [parsed])
     in
     let block = BlockExpr expr_ls in
-    let block = Preprocess.resolve_imports (Preprocess.ExprNode (locate block)) in
-    let expr_ls = match block with
-        | {data = BlockExpr ls; _} -> ls
-        | _ -> assert false
-    in
     let static_atoms =
-        Preprocess.find_atoms (ExprNode block) ss.static_atoms
+        Preprocess.find_atoms (ExprNode (locate block)) ss.static_atoms
     in
     let static_idents =
-        Preprocess.find_idents (ExprNode block) ss.static_idents
+        Preprocess.find_idents (ExprNode (locate block)) ss.static_idents
     in
     (* List.iter static_idents ~f:(fun (k, v) -> printf "%s: %d\n" k v); *)
     let ss = { ss with static_atoms; static_idents } in