Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(compiler): Remove unnecessary fix_blocks in parser #2052

Merged
merged 1 commit into from Mar 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 1 addition & 28 deletions compiler/src/parsing/parser_header.re
Expand Up @@ -34,33 +34,6 @@ let to_loc = ((loc_start, loc_end)) => {
{loc_start, loc_end, loc_ghost: false};
};

let fix_tyvar_mapper = super => {
open Ast_mapper;
open Ast_helper;
let typ = (mapper, {ptyp_desc, ptyp_loc} as t) =>
switch (ptyp_desc) {
| PTyVar(v)
when
v != ""
&& (
switch (v.[0]) {
| 'A' .. 'Z' => true
| _ => false
}
) =>
let id = mkloc(IdentName(mkloc(v, ptyp_loc)), ptyp_loc);
{...t, ptyp_desc: PTyConstr(id, [])};
| _ => super.typ(mapper, t)
};
{...super, typ};
};

let fix_blocks = ({statements} as prog) => {
open Ast_mapper;
let mapper = default_mapper |> fix_tyvar_mapper;
{...prog, statements: List.map(mapper.toplevel(mapper), statements)};
};

let mkid = ns => {
let help = ns => {
let rec help = (ns, (acc_ident, acc_str)) => {
Expand Down Expand Up @@ -122,7 +95,7 @@ let make_program = (~loc, module_name, statements) => {
let loc_start = {...loc.loc_start, pos_lnum: 1, pos_cnum: 0, pos_bol: 0};
let prog_loc = {...loc, loc_start};

fix_blocks({module_name, statements, comments: [], prog_loc});
{module_name, statements, comments: [], prog_loc};
};

let parse_program = (program, token, lexbuf) => {
Expand Down