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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

feat(compiler): Support record field updating assignment #1320

Merged
merged 4 commits into from
Jun 13, 2022
Merged

feat(compiler): Support record field updating assignment #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdbf410
feat(compiler): Support record field updating assignment
ospencer Jun 11, 2022
1a9b0ff
Update formatter tests
ospencer Jun 11, 2022
49a68e8
Add test
ospencer Jun 11, 2022
df9548f
Update parser.messages
ospencer Jun 12, 2022
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
169 changes: 81 additions & 88 deletions compiler/src/formatting/format.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,15 +2348,13 @@ and print_expression =
print_ident(txt),
])
| PExpRecordSet(expression, {txt, _}, expression2) =>
Doc.concat([
print_expression(~original_source, ~comments, expression),
Doc.dot,
print_ident(txt),
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, expression2),
])
let left =
Doc.concat([
print_expression(~original_source, ~comments, expression),
Doc.dot,
print_ident(txt),
]);
print_assignment(~original_source, ~comments, left, expression2);
| PExpMatch(expression, match_branches) =>
let arg =
Doc.concat([
Expand Down Expand Up @@ -3100,97 +3098,92 @@ and print_expression =
print_expression(~original_source, ~comments, expression1),
])
| PExpAssign(expression, expression1) =>
switch (expression1.pexp_desc) {
| PExpApp(func, expressions) =>
let function_name = get_function_name(func);

let trimmed_operator = String.trim(function_name);
let left = print_expression(~original_source, ~comments, expression);
print_assignment(~original_source, ~comments, left, expression1);
| /** Used for modules without body expressions */ PExpNull => Doc.nil
};

let left = print_expression(~original_source, ~comments, expression);
expression_doc;
}
and print_assignment = (~original_source, ~comments, left, value) => {
switch (value.pexp_desc) {
| PExpApp(func, expressions) =>
let function_name = get_function_name(func);

let left_matches_first =
switch (expressions) {
| [expr, ...remainder] =>
print_expression(~original_source, ~comments, expr) == left
| _ => false
};
let trimmed_operator = String.trim(function_name);

if (left_matches_first) {
// +=, -=, *=, /=, and %=
switch (trimmed_operator) {
| "+"
| "-"
| "*"
| "/"
| "%" =>
let sugared_op = Doc.text(" " ++ trimmed_operator ++ "= ");
Doc.concat([
print_expression(~original_source, ~comments, expression),
sugared_op,
switch (expressions) {
| [] =>
raise(
IllegalParse("Sugared op needs at least one expression"),
)
| [expression] =>
let expr =
print_expression(~original_source, ~comments, expression);
switch (expression.pexp_desc) {
| PExpIf(_) =>
Doc.indent(
print_expression(~original_source, ~comments, expression),
)
| _ => expr
};
| [expression1, expression2, ...rest] =>
let expr =
print_expression(~original_source, ~comments, expression2);
switch (expression2.pexp_desc) {
| PExpIf(_) =>
Doc.indent(
print_expression(
~original_source,
~comments,
expression2,
),
)
| _ => expr
};
},
]);
| _ =>
Doc.concat([
print_expression(~original_source, ~comments, expression),
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, expression1),
])
};
} else {
Doc.concat([
print_expression(~original_source, ~comments, expression),
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, expression1),
]);
};
let left_matches_first =
switch (expressions) {
| [expr, ...remainder] =>
print_expression(~original_source, ~comments, expr) == left
| _ => false
};

if (left_matches_first) {
// +=, -=, *=, /=, and %=
switch (trimmed_operator) {
| "+"
| "-"
| "*"
| "/"
| "%" =>
let sugared_op = Doc.text(" " ++ trimmed_operator ++ "= ");
Doc.concat([
left,
sugared_op,
switch (expressions) {
| [] =>
raise(IllegalParse("Sugared op needs at least one expression"))
| [expression] =>
let expr =
print_expression(~original_source, ~comments, expression);
switch (expression.pexp_desc) {
| PExpIf(_) =>
Doc.indent(
print_expression(~original_source, ~comments, expression),
)
| _ => expr
};
| [expression1, expression2, ...rest] =>
let expr =
print_expression(~original_source, ~comments, expression2);
switch (expression2.pexp_desc) {
| PExpIf(_) =>
Doc.indent(
print_expression(~original_source, ~comments, expression2),
)
| _ => expr
};
},
]);
| _ =>
Doc.concat([
print_expression(~original_source, ~comments, expression),
left,
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, expression1),
print_expression(~original_source, ~comments, value),
])
}

| /** Used for modules without body expressions */ PExpNull => Doc.nil
};
} else {
Doc.concat([
left,
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, value),
]);
};

expression_doc;
| _ =>
Doc.concat([
left,
Doc.space,
Doc.equal,
Doc.space,
print_expression(~original_source, ~comments, value),
])
};
}
and print_value_bind =
(
Expand Down
Loading