Skip to content
This repository was archived by the owner on Apr 24, 2021. It is now read-only.

Make the unmonad script turn the let% into switch instead #89

Merged
merged 2 commits into from
Apr 7, 2021
Merged

Make the unmonad script turn the let% into switch instead #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b9a52
Make the unmonad script turn the let% into `switch` instead
chenglou Apr 7, 2021
01813dc
Check in the tests on 2 files
chenglou Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions src/ppx2/Ppx_Unmonads.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,31 @@ let mapper =
| Pexp_extension(({txt: (
"opt" | "opt_consume"
| "try" | "try_wrap"
) as txt, loc}, PStr([{pstr_desc: Pstr_eval({pexp_desc: Pexp_let(Nonrecursive, bindings, continuation)}, _attributes)}]))) => {
let (front, explanation) = switch (txt) {
| "opt" => ([%expr Monads.Option.bind], opt_explanation)
| "opt_consume" => ([%expr Monads.Option.consume], opt_consume_explanation)
| "try" => ([%expr Monads.Result.bind], "Sugar for the Result type")
| "try_wrap" => ([%expr Monads.Result.map], "Sugar for the Result type - auto-wraps in `Ok()`")
| _ => assert(false)
};
) as txt}, PStr([{pstr_desc: Pstr_eval({pexp_desc: Pexp_let(Nonrecursive, bindings, continuation)}, _attributes)}]))) => {
let (pat, expr) = process_bindings(bindings);
Ast_helper.Exp.attr(
[%expr [%e front]([%e mapper.expr(mapper, expr)], ~f=([%p pat]) => [%e mapper.expr(mapper, continuation)])],
({txt: "ocaml.explanation", loc}, PStr([
Ast_helper.Str.eval(Ast_helper.Exp.constant(Pconst_string(explanation, None)))
]))
)
switch (txt) {
| "opt" =>
[%expr [%e [%expr switch [%e mapper.expr(mapper, expr)] {
| None => None
| Some([%p pat]) => [%e mapper.expr(mapper, continuation)]
}]]]
| "opt_consume" =>
[%expr [%e [%expr switch [%e mapper.expr(mapper, expr)] {
| None => ()
| Some([%p pat]) => [%e mapper.expr(mapper, continuation)]
}]]]
| "try" =>
[%expr [%e [%expr switch [%e mapper.expr(mapper, expr)] {
| Error(e) => Error(e)
| Ok([%p pat]) => [%e mapper.expr(mapper, continuation)]
}]]]
| "try_wrap" =>
[%expr [%e [%expr switch [%e mapper.expr(mapper, expr)] {
| Error(e) => Error(e)
| Ok([%p pat]) => Ok([%e mapper.expr(mapper, continuation)])
}]]]
| _ => assert(false)
};
}
| _ => Ast_mapper.default_mapper.expr(mapper, expr)
}
Expand Down
9 changes: 5 additions & 4 deletions src/rescript-editor-support/BuildSystem.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ let getBsPlatformDir = rootPath => {
let getCompiledBase = root => {
Files.ifExists(root /+ "lib" /+ "bs");
};
let getStdlib = base => {
let%try_wrap bsPlatformDir = getBsPlatformDir(base);
bsPlatformDir /+ "lib" /+ "ocaml";
};
let getStdlib = base =>
switch (getBsPlatformDir(base)) {
| Error(e) => Error(e)
| Ok(bsPlatformDir) => Ok(bsPlatformDir /+ "lib" /+ "ocaml")
};
70 changes: 38 additions & 32 deletions src/rescript-editor-support/FindFiles.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,36 +299,39 @@ let findDependencyFiles = (~debug, base, config) => {
let namespace = getNamespace(inner);
let directories =
getSourceDirectories(~includeDev=false, loc, inner);
let%opt compiledBase = BuildSystem.getCompiledBase(loc);
/* |! "No compiled base found"; */
if (debug) {
Log.log("Compiled base: " ++ compiledBase);
switch (BuildSystem.getCompiledBase(loc)) {
| None => None
| Some(compiledBase) =>
if (debug) {
Log.log("Compiled base: " ++ compiledBase);
};
let compiledDirectories =
directories |> List.map(Files.fileConcat(compiledBase));
let compiledDirectories =
namespace == None
? compiledDirectories
: [compiledBase, ...compiledDirectories];
let files =
findProjectFiles(
~debug,
namespace,
loc,
directories,
compiledBase,
);
/* let files =
switch (namespace) {
| None =>
files
| Some(namespace) =>
files
|> List.map(((name, paths)) =>
(namespace ++ "-" ++ name, paths)
)
}; */
Some((compiledDirectories, files));
};
let compiledDirectories =
directories |> List.map(Files.fileConcat(compiledBase));
let compiledDirectories =
namespace == None
? compiledDirectories
: [compiledBase, ...compiledDirectories];
let files =
findProjectFiles(
~debug,
namespace,
loc,
directories,
compiledBase,
);
/* let files =
switch (namespace) {
| None =>
files
| Some(namespace) =>
files
|> List.map(((name, paths)) =>
(namespace ++ "-" ++ name, paths)
)
}; */
Some((compiledDirectories, files));
| None => None
};
}
Expand All @@ -343,8 +346,11 @@ let findDependencyFiles = (~debug, base, config) => {
});
let (directories, files) = List.split(depFiles);
let files = List.concat(files);
let%try stdlibDirectory = BuildSystem.getStdlib(base);
let directories = [stdlibDirectory, ...List.concat(directories)];
let results = files @ collectFiles(stdlibDirectory);
Ok((directories, results));
switch (BuildSystem.getStdlib(base)) {
| Error(e) => Error(e)
| Ok(stdlibDirectory) =>
let directories = [stdlibDirectory, ...List.concat(directories)];
let results = files @ collectFiles(stdlibDirectory);
Ok((directories, results));
};
};