AST: store the attributes directly on function arguments. #7660
+112
−135
Conversation
This file contains hidden or 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
Functions of several arguments are stored as nested `Ptyp_arrow` ast nodes, with attributes at toplevel in the node. This change adds an attribute field to type arguments, makin it impossible to distinguish attributes on arguments from attributes on the entire function.
efc80bd to
df4c0ab
Compare
rescript
@rescript/darwin-arm64
@rescript/darwin-x64
@rescript/linux-arm64
@rescript/linux-x64
@rescript/win32-x64
commit: |
nojaf
reviewed
Jul 17, 2025
| @@ -15,7 +15,7 @@ module C4A1 = { | |||
| @res.jsxComponentProps @live | |||
| type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type} | |||
|
|
|||
| external make: @as("open") React.componentLike<props<string, string>, React.element> = "default" | |||
| external make: React.componentLike<props<string, string>, React.element> = "default" | |||
There was a problem hiding this comment.
This was captured by chance I think, as the open is on the prop, not on the make function:
module C4A1 = {
@react.component
external make: (@as("open") ~_open: string, @as("type") ~_type: string) => React.element =
"default"
}
cristianoc
commented
Jul 17, 2025
There was a problem hiding this comment.
@zth looks like the editor tooling does not use attributes on functions anywhere -- does this sound right? Just double checking.
The new attributes are not passed to the typed ast yet (will be a simple change later on).
| @@ -22,13 +22,13 @@ type nonrec t = f:(int -> string (a:1)) -> float (a:1) | |||
| type nonrec t = f:(int -> string (a:1)) -> float | |||
| type nonrec t = f:int -> string -> float (a:1) | |||
| type nonrec t = | |||
| ((a:int -> ((b:int -> ((float)[@attr ]) -> unit)[@attrBeforeLblB ]) (a:3)) | |||
| [@attrBeforeLblA ]) | |||
| a:int[@attrBeforeLblA ] -> | |||
There was a problem hiding this comment.
This is ocaml's Pprintast -- it's now clear that attributes go on type arguments.
| @@ -15,7 +15,7 @@ module C4A1 = { | |||
| @res.jsxComponentProps @live | |||
| type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type} | |||
|
|
|||
| external make: @as("open") React.componentLike<props<string, string>, React.element> = "default" | |||
| external make: React.componentLike<props<string, string>, React.element> = "default" | |||
There was a problem hiding this comment.
This was captured by chance I think, as the open is on the prop, not on the make function:
module C4A1 = {
@react.component
external make: (@as("open") ~_open: string, @as("type") ~_type: string) => React.element =
"default"
}| @@ -132,7 +132,7 @@ type t = @attr (foo, @attr2 ~f: bar, @attr3 ~f: baz) => unit | |||
| type t = @attr (string => @attr (int => unit)) | |||
| type t = @attr (string, int) => @attr (int, float) => unit | |||
| type t = @attr (int => @attr (int, float) => @attr (unit => unit => unit)) | |||
| type t = (@attr @attr2 ~f: int, @attr3 ~g: float) => unit | |||
| type t = @attr (@attr2 ~f: int, @attr3 ~g: float) => unit | |||
There was a problem hiding this comment.
This now correctly represents this type, distinguishing the attribute on the whole function from those on the function arguments:
type t = @attr ((@attr2 ~f: int, @attr3 ~g: float) => unit)Introduces an 'attrs' field to the 'arg' record in typedtree.ml and typedtree.mli to support attributes on function arguments. Updates related code in typetexp.ml and printtyped.ml to handle the new field, enabling attribute preservation and printing for function argument types.
Sounds correct! |
zth
approved these changes
Jul 17, 2025
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.
Functions of several arguments are stored as nested
Ptyp_arrowast nodes, with attributes at toplevel in the node. This change adds an attribute field to type arguments, makin it impossible to distinguish attributes on arguments from attributes on the entire function.