Change char payload #5759
Merged
Change char payload #5759
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bobzhang
reviewed
Oct 28, 2022
| @@ -21,7 +21,7 @@ open Lambda | |||
|
|
|||
| let rec struct_const ppf = function | |||
| | Const_base(Const_int n) -> fprintf ppf "%i" n | |||
| | Const_base(Const_char c) -> fprintf ppf "%C" c | |||
| | Const_base(Const_char i) -> fprintf ppf "%C" (Char.unsafe_chr i) | |||
| | Const_base(Const_string (s, _)) -> fprintf ppf "%S" s | |||
There was a problem hiding this comment.
this should be adapted, '%C' may not apply any more
There was a problem hiding this comment.
Thank you! I'm fixing this.
bobzhang
reviewed
Oct 31, 2022
| @@ -379,7 +379,7 @@ let is_cons = function | |||
|
|
|||
| let pretty_const c = match c with | |||
| | Const_int i -> Printf.sprintf "%d" i | |||
| | Const_char c -> Printf.sprintf "%C" c | |||
| | Const_char i -> Printf.sprintf "%s" (Pprintast.string_of_int_as_char i) | |||
| | Const_string (s, _) -> Printf.sprintf "%S" s | |||
There was a problem hiding this comment.
Printast.string_of_int_as_char vs Ext_util.string_of_int_as_char?
There was a problem hiding this comment.
It seems they are the same but shared across two repos
|
LGTM, this also fixes #5753, you may add a changelog after it landed |
|
I landed changes in syntax repo, you also need update the submodule in later commits |
bobzhang
pushed a commit
that referenced
this pull request
Oct 31, 2022
* change Pconst_char payload (WIP) * tweak * tweak * representation of char for lambda * lib * bugfix: replace wrong pp * libs * bugfix: replace wrong print * use unsafe_chr to handle possible overflow char * safe print int as char * reduce duplication * (re)use encodeCodepoint to support string_of_int_as_char * some refactor * libs * changelog
bobzhang
pushed a commit
that referenced
this pull request
Oct 31, 2022
* change Pconst_char payload (WIP) * tweak * tweak * representation of char for lambda * lib * bugfix: replace wrong pp * libs * bugfix: replace wrong print * use unsafe_chr to handle possible overflow char * safe print int as char * reduce duplication * (re)use encodeCodepoint to support string_of_int_as_char * some refactor * libs * changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes the payload of
Pconst_char. Related context: #5750 #5749As I understand, the payload of
char-related typesuses magic starting from parsing to JavaScript dumping.So lots of files were changed.
There are some things I don't quite understand:
The syntax repository and the compiler repository have some modules that are not exactly the same. Which one should we use for synchronization?
Because I modified the payload of
Pconst_char, I had to modifyparser.mlyin the compiler repository, but I'm not sure if I'm safe to do that.If my practice is on the right track, I will open another PR to submit the remaining part of
syntaxrepo.