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

Fix calc function #506

Merged
merged 4 commits into from
Aug 17, 2024
Merged

Fix calc function #506

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
155cdc7
fix calc function initial
zakybilfagih Aug 15, 2024
192055a
final showdown
zakybilfagih Aug 15, 2024
1a38d24
yay now paren works!
zakybilfagih Aug 16, 2024
bcd0738
Merge branch 'main' into fix-calc-function
zakybilfagih Aug 17, 2024
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
1 change: 1 addition & 0 deletions e2e/melange/src/ui/ui.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module Cositas = [%styled.div
display: flex;
flex-direction: column;
gap: $(lola);
height: calc(1px * (2 + 3 / 3));
|}
];

Expand Down
2 changes: 1 addition & 1 deletion packages/css-property-parser/lib/Parser.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ and calc_product = [%value.rec
and calc_sum = [%value.rec "<calc-product> [ [ '+' | '-' ] <calc-product> ]*"]
/* and calc_value = [%value.rec "<number> | <dimension> | <extended-percentage> | <calc>"] */
and calc_value = [%value.rec
"<number> | <extended-length> | <extended-percentage> | <extended-angle> | <extended-time>"
"<number> | <extended-length> | <extended-percentage> | <extended-angle> | <extended-time> | '(' <calc-sum> ')'"
]
and cf_final_image = [%value.rec "<image> | <color>"]
and cf_mixing_image = [%value.rec "[ <extended-percentage> ]? && <image>"]
Expand Down
10 changes: 9 additions & 1 deletion packages/css-property-parser/lib/Standard.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ open Rule.Pattern;

let keyword = string => expect(IDENT(string));
let comma = expect(COMMA);
let delim = string => expect(DELIM(string));
let delim =
fun
| "(" => expect(LEFT_PAREN)
| ")" => expect(RIGHT_PAREN)
| "[" => expect(LEFT_BRACKET)
| "]" => expect(RIGHT_BRACKET)
| ":" => expect(COLON)
| ";" => expect(SEMI_COLON)
| s => expect(DELIM(s));
let function_call = (name, rule) => {
let.bind_match () =
token(
Expand Down
87 changes: 43 additions & 44 deletions packages/ppx/src/Property_to_runtime.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,28 +320,33 @@ let render_length = (~loc) =>
| `Zero => [%expr `zero];

let rec render_function_calc = (~loc, calc_sum) => {
render_calc_sum(~loc, calc_sum);
[%expr `calc([%e render_calc_sum(~loc, calc_sum)])];
}

and render_calc_sum = (~loc, calc_sum) => {
switch (calc_sum) {
| (product, []) => render_product(~loc, product)
| (product, list_of_sums) =>
/* This isn't a great design of the types, but we need to know the operation
which is in the first position of the array, we ensure that there's one value
since we are on this branch of the switch */
let op = pick_operation(List.hd(list_of_sums));
switch (op) {
| `Dash () =>
let first = render_product(~loc, product);
let second = render_list_of_sums(~loc, list_of_sums);
[%expr `calc(`sub(([%e first], [%e second])))];
| `Cross () =>
let first = render_product(~loc, product);
let second = render_list_of_sums(~loc, list_of_sums);
[%expr `calc(`add(([%e first], [%e second])))];
and render_calc_sum = (~loc, (product, sums): Types.calc_sum) => {
let rec go = (left, rest) => {
switch (rest) {
| [] => left
| [x, ...xs] =>
switch (x) {
| (`Cross (), calc_product) =>
go(
[%expr
`add(([%e left], [%e render_calc_product(~loc, calc_product)]))
],
xs,
)
| (`Dash (), calc_product) =>
go(
[%expr
`sub(([%e left], [%e render_calc_product(~loc, calc_product)]))
],
xs,
)
}
};
};
go(render_calc_product(~loc, product), sums);
}
and render_function_min_or_max = (~loc, calc_sums: list(Types.calc_sum)) => {
switch (calc_sums) {
Expand All @@ -357,33 +362,26 @@ and render_function_min = (~loc, calc_sums) => {
and render_function_max = (~loc, calc_sums) => {
[%expr `max([%e render_function_min_or_max(~loc, calc_sums)])];
}
and pick_operation = ((op, _)) => op
and render_list_of_products = (~loc, list_of_products) => {
switch (list_of_products) {
| [one] => render_product_op(~loc, one)
| list => render_list_of_products(~loc, list)
};
}
and render_list_of_sums = (~loc, list_of_sums) => {
switch (list_of_sums) {
| [(_, one)] => render_product(~loc, one)
| list => render_list_of_sums(~loc, list)
};
}
and render_product = (~loc, product) => {
switch (product) {
| (calc_value, []) => render_calc_value(~loc, calc_value)
| (calc_value, list_of_products) =>
let first = render_calc_value(~loc, calc_value);
let second = render_list_of_products(~loc, list_of_products);
[%expr `calc(`mult(([%e first], [%e second])))];
};
}
and render_product_op = (~loc, op) => {
switch (op) {
| `Static_0((), calc_value) => render_calc_value(~loc, calc_value)
| `Static_1((), float) => [%expr `num([%e render_float(~loc, float)])]
and render_calc_product = (~loc, (value, products): Types.calc_product) => {
let rec go = (left, rest) => {
switch (rest) {
| [] => left
| [x, ...xs] =>
switch (x) {
| `Static_0(_, value) =>
go(
[%expr `mult(([%e left], [%e render_calc_value(~loc, value)]))],
xs,
)
| `Static_1(_, float_value) =>
go(
[%expr `div(([%e left], [%e render_float(~loc, float_value)]))],
xs,
)
}
};
};
go(render_calc_value(~loc, value), products);
}
and render_angle = (~loc) =>
fun
Expand Down Expand Up @@ -434,6 +432,7 @@ and render_calc_value = (~loc, calc_value) => {
| `Extended_percentage(p) => render_extended_percentage(~loc, p)
| `Extended_angle(a) => render_extended_angle(~loc, a)
| `Extended_time(t) => render_extended_time(~loc, t)
| `Static(_, calc_sum, _) => render_calc_sum(~loc, calc_sum)
};
}
and render_extended_length = (~loc) =>
Expand Down
87 changes: 41 additions & 46 deletions packages/ppx/src/Property_to_string.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,31 @@ let render_length =
| `Vw(n) => render_number(n, "vw")
| `Zero => render_string("0");

let rec render_function_calc = calc_sum => {
render_calc_sum(calc_sum);
let rec render_function_calc =
(calc_sum: Css_property_parser.Parser.Types.calc_sum) => {
[%expr "calc(" ++ [%e render_calc_sum(calc_sum)] ++ ")"];
}
and render_calc_sum = ((product, sums)) => {
let rec go = (left, rest) => {
switch (rest) {
| [] => left
| [x, ...xs] =>
switch (x) {
| (`Cross (), calc_product) =>
go(
[%expr [%e left] ++ " + " ++ [%e render_product(calc_product)]],
xs,
)
| (`Dash (), calc_product) =>
go(
[%expr [%e left] ++ " - " ++ [%e render_product(calc_product)]],
xs,
)
}
};
};
go(render_product(product), sums);
}
and render_calc_sum = calc_sum =>
switch (calc_sum) {
| (product, []) => render_product(product)
| (product, list_of_sums) =>
/* This isn't a great design of the types, but we need to know the operation
which is in the first position of the array, we ensure that there's one value
since we are on this branch of the switch */
let op = pick_operation(List.hd(list_of_sums));
let first = render_product(product);
let second = render_list_of_sums(list_of_sums);
[%expr "calc(" ++ [%e first] ++ [%e op] ++ [%e second] ++ ")"];
}
and render_function_min_or_max = calc_sums => {
switch (calc_sums) {
| [] => raise(Invalid_value("expected at least one argument"))
Expand All @@ -162,39 +172,23 @@ and render_function_min = calc_sums => {
and render_function_max = calc_sums => {
render_function_min_or_max(calc_sums);
}
and render_sum_op = op => {
switch (op) {
| `Dash () => [%expr " - "]
| `Cross () => [%expr " + "]
};
}
and pick_operation = ((op, _)) => render_sum_op(op)
and render_list_of_products = list_of_products => {
switch (list_of_products) {
| [one] => render_product_op(one)
| list => render_list_of_products(list)
};
}
and render_list_of_sums = list_of_sums => {
switch (list_of_sums) {
| [(_, one)] => render_product(one)
| list => render_list_of_sums(list)
};
}
and render_product = product => {
switch (product) {
| (calc_value, []) => render_calc_value(calc_value)
| (calc_value, list_of_products) =>
let first = render_calc_value(calc_value);
let second = render_list_of_products(list_of_products);
[%expr "calc(" ++ [%e first] ++ " * " ++ [%e second] ++ ")"];
};
}
and render_product_op = op => {
switch (op) {
| `Static_0((), calc_value) => render_calc_value(calc_value)
| `Static_1((), float) => render_number(float, "")
and render_product = ((value, products)) => {
let rec go = (left, rest) => {
switch (rest) {
| [] => left
| [x, ...xs] =>
switch (x) {
| `Static_0(_, value) =>
go([%expr [%e left] ++ " * " ++ [%e render_calc_value(value)]], xs)
| `Static_1(_, float_value) =>
go(
[%expr [%e left] ++ " / " ++ [%e render_number(float_value, "")]],
xs,
)
}
};
};
go(render_calc_value(value), products);
}
and render_calc_value = calc_value => {
switch (calc_value) {
Expand All @@ -203,6 +197,7 @@ and render_calc_value = calc_value => {
| `Extended_percentage(p) => render_extended_percentage(p)
| `Extended_angle(a) => render_extended_angle(a)
| `Extended_time(t) => render_extended_time(t)
| `Static(_, calc_sum, _) => render_calc_sum(calc_sum)
};
}
and render_time_as_int =
Expand Down
4 changes: 1 addition & 3 deletions packages/ppx/test/css-support/calc.t/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ If this test fail means that the module is not in sync with the ppx
`calc(
`mult((
`rem(2.),
`calc(
`mult((`rem(2.), `calc(`mult((`rem(2.), `num(4.)))))),
),
`calc(`mult((`rem(2.), `calc(`div((`rem(2.), 4.)))))),
)),
),
)),
Expand Down
2 changes: 1 addition & 1 deletion packages/ppx/test/css-support/color-module.t/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,5 @@ If this test fail means that the module is not in sync with the ppx
CSS.unsafe({js|columnRuleColor|js}, {js|#000000FF|js});
CSS.unsafe({js|columnRuleColor|js}, {js|rebeccapurple|js});

CSS.color(`rgba((0, 0, 0, `num(1.))));
CSS.color(`rgba((0, 0, 0, `calc(`num(1.)))));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is correct, calc shouldn't leak here

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So calc(1) should evaluate to 1?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, I read the diff wrong. I thought calc wasn't on the value.

CSS.color(`rgba((0, 0, 0, `calc(`sub((`num(10.), `num(1.)))))));
7 changes: 3 additions & 4 deletions packages/ppx/test/native/Static_test.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,11 +668,10 @@ let properties_static_css_tests = [
[%expr [%css "flex: none"]],
[%expr CSS.flex1(`none)],
),
/* Since calc(x) -> x */
(
[%css "width: calc(100px)"],
[%expr [%css "width: calc(100px)"]],
[%expr CSS.width(`pxFloat(100.))],
[%expr CSS.width(`calc(`pxFloat(100.)))],
),
(
[%css "width: calc(100% + 32px)"],
Expand Down Expand Up @@ -1166,12 +1165,12 @@ let properties_static_css_tests = [
(
[%css "transition-duration: max(3s, calc(1ms))"],
[%expr [%css "transition-duration: max(3s, calc(1ms))"]],
[%expr CSS.transitionDuration(`max([|`s(3), `ms(1)|]))],
[%expr CSS.transitionDuration(`max([|`s(3), `calc(`ms(1))|]))],
),
(
[%css "transition-duration: max(+3s, calc(-0ms))"],
[%expr [%css "transition-duration: max(+3s, calc(-0ms))"]],
[%expr CSS.transitionDuration(`max([|`s(3), `ms(0)|]))],
[%expr CSS.transitionDuration(`max([|`s(3), `calc(`ms(0))|]))],
),
(
[%css "animation: 3s"],
Expand Down
2 changes: 2 additions & 0 deletions packages/runtime/native/shared/Css_types.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ module Calc = struct
{js|calc(|js} ^ fn a ^ {js| * |js} ^ fn b ^ {js|)|js}
| `calc (`div (a, b)) ->
{js|calc(|js} ^ fn a ^ {js| / |js} ^ Kloth.Float.to_string b ^ {js|)|js}
| `calc (`num a) -> {js|calc(|js} ^ Kloth.Float.to_string a ^ {js|)|js}
| `num n -> Kloth.Float.to_string n
| `min xs -> {js|min(|js} ^ max_or_min_values fn xs ^ {js|)|js}
| `max xs -> {js|max(|js} ^ max_or_min_values fn xs ^ {js|)|js}
Expand Down Expand Up @@ -1328,6 +1329,7 @@ module Color = struct
| `sub of 'a * 'a
| `mult of 'a * 'a
| `div of 'a * float
| `num of float
]
| `min of 'a array
| `max of 'a array
Expand Down