Skip to content

Attr class 4.03#487

Merged
damiendoligez merged 2 commits intoocaml:4.03from
Drup:attr_class_4.03
Mar 8, 2016
Merged

Attr class 4.03#487
damiendoligez merged 2 commits intoocaml:4.03from
Drup:attr_class_4.03

Conversation

@Drup
Copy link
Copy Markdown
Contributor

@Drup Drup commented Feb 27, 2016

Remake of #481, but to the right branch. Original text below


This is a fix for #342 (comment). I forgot class types, so here they are. I also fixed the order for shortcut/flags on class fields and added the relevant tests.

Note that the order for the ! flag on class fields is a bit irregular:

val! [@foo] ...

and not

val [@foo] ! ...

I think this is for the best. If anyone disagree, I can change it.

I also had to copy the trick used in the method_ rule to avoid a conflict in the grammar. As the TODO says, this part would benefit a lot from a little cleanup.

@damiendoligez damiendoligez added this to the 4.03.0 milestone Feb 29, 2016
@Drup Drup force-pushed the attr_class_4.03 branch from 5c4761f to 102d968 Compare March 2, 2016 20:16
@Drup
Copy link
Copy Markdown
Contributor Author

Drup commented Mar 3, 2016

@damiendoligez CI is happy now!

@damiendoligez
Copy link
Copy Markdown
Member

I hope this is not going to conflict with #477 ...

@trefis
Copy link
Copy Markdown
Contributor

trefis commented Mar 3, 2016

It should be fine, we're not touching the same rules.

@Drup Drup force-pushed the attr_class_4.03 branch from 102d968 to 51e330d Compare March 3, 2016 16:31
@Drup
Copy link
Copy Markdown
Contributor Author

Drup commented Mar 3, 2016

I rebased on top of @trefis's patch, no conflicts, tests still pass.

@Drup Drup mentioned this pull request Mar 8, 2016
damiendoligez added a commit that referenced this pull request Mar 8, 2016
@damiendoligez damiendoligez merged commit 8eb1190 into ocaml:4.03 Mar 8, 2016
@Drup Drup deleted the attr_class_4.03 branch March 8, 2016 11:09
stedolan pushed a commit to stedolan/ocaml that referenced this pull request May 24, 2022
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
Tailwind 3.1.0 introduced the support for postcss-import in their standalone CLI. This allows us to revert part of ocaml/ocaml.org#354 and split our CSS file into multiple files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants