Syntax factory #1530
Draft
Syntax factory #1530
+1,789
−1,759
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
…statics tests - Uses temp module to remove fresh/invalid calls in statics test - Uses Info error module to create expressions with default no errors
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #1530 +/- ##
==========================================
+ Coverage 50.33% 50.88% +0.55%
==========================================
Files 103 103
Lines 10442 10594 +152
==========================================
+ Hits 5256 5391 +135
- Misses 5186 5203 +17
|
7h3kk1d
commented
Feb 20, 2025
src/haz3lcore/lang/term/Grammar.re
Outdated
| }; | ||
|
|
||
| // pat | ||
| let pat_invalid = (~ann=?, s): pat_t(DefaultAnnotation.t) => { |
There was a problem hiding this comment.
We can also nest modules inside here instead of prepending sort. This works with local open so you could do:
FTemp.(Exp.(list([int(1), int(2), cast(int(3), Typ.int(), Typ.unknown(Internal)))))
7h3kk1d
commented
Feb 20, 2025
test/Test_Statics.re
Outdated
Comment on lines
433
to
445
| ty_prod([ | ||
| ty_tup_label( | ||
| ty_label("a"), | ||
| ty_prod([ | ||
| ty_tup_label( | ||
| ty_label("b"), | ||
| ty_prod([ | ||
| ty_tup_label(ty_label("c"), ty_unknown(Hole(EmptyHole))), | ||
| ]), | ||
| ), | ||
| ]), | ||
| ), | ||
| ]), |
There was a problem hiding this comment.
Example of the fresh calls being removed.
7h3kk1d
commented
Feb 20, 2025
test/Test_Statics.re
Outdated
Comment on lines
795
to
884
| Common( | ||
| TupleLabelError({ | ||
| malformed_labels: [], | ||
| duplicate_labels: [], | ||
| invalid_labels: ["c"], | ||
| typ: | ||
| TupLabel( | ||
| Label("c") |> Typ.fresh, | ||
| Int |> Typ.fresh, | ||
| ) | ||
| |> Typ.fresh, | ||
| }), | ||
| ), | ||
| ), | ||
| TupLabel( | ||
| error_exp( | ||
| Exp(Common(NoType(InvalidLabel("c")))), | ||
| Label("c"), | ||
| Inconsistent( | ||
| FTemp.( | ||
| Expectation({ | ||
| ana: | ||
| ty_parens( | ||
| ty_prod([ | ||
| ty_int(), | ||
| ty_tup_label(ty_label("a"), ty_string()), | ||
| ]), | ||
| ), | ||
| syn: | ||
| ty_prod([ | ||
| ty_tup_label(ty_label("c"), ty_int()), | ||
| ty_tup_label(ty_label("a"), ty_string()), | ||
| ]), | ||
| }) | ||
| ), | ||
| no_error_exp(Int(1)), | ||
| ), | ||
| ), | ||
| no_error_exp( | ||
| TupLabel( | ||
| no_error_exp(Label("a")), | ||
| no_error_exp(String("hello")), | ||
| ), | ||
| ), | ||
| tuple( | ||
| ~ann= | ||
| Some( | ||
| Exp( | ||
| Common( | ||
| TupleLabelError({ | ||
| malformed_labels: [], | ||
| duplicate_labels: [], | ||
| invalid_labels: ["c"], | ||
| typ: | ||
| FTemp.( | ||
| ty_prod([ | ||
| ty_tup_label(ty_label("c"), ty_int()), | ||
| ty_tup_label(ty_label("a"), ty_string()), | ||
| ]) | ||
| ), | ||
| }), | ||
| ), | ||
| ), | ||
| ]), | ||
| ), | ||
| ), | ||
| [ | ||
| { | ||
| tup_label( | ||
| ~ann= | ||
| Some( | ||
| Exp( | ||
| Common( | ||
| TupleLabelError({ | ||
| malformed_labels: [], | ||
| duplicate_labels: [], | ||
| invalid_labels: ["c"], | ||
| typ: | ||
| FTemp.( | ||
| ty_tup_label(ty_label("c"), ty_int()) | ||
| ), | ||
| }), | ||
| ), | ||
| ), | ||
| ), | ||
| error_exp( | ||
| Exp(Common(NoType(InvalidLabel("c")))), | ||
| Label("c"), | ||
| ), | ||
| int(1), | ||
| ); | ||
| }, | ||
| tup_label(label("a"), string("hello")), | ||
| ], | ||
| ), | ||
| ), | ||
| no_error_exp(Bool(true)), | ||
| ), | ||
| bool(true), | ||
| ) |
There was a problem hiding this comment.
The test is significantly smaller and only 30 out of the remaining ~90 lines are the AST. The rest are the annotations.
7h3kk1d
force-pushed
the
syntax_factory
branch
from
d4c597f to
c5ebe7d
Compare
7h3kk1d
commented
Feb 26, 2025
| let default_annotation = ann => | ||
| Option.value(~default=DefaultAnnotation.default_value(), ann); | ||
| module Exp = { | ||
| let invalid = (~ann=?, s): exp_t(DefaultAnnotation.t) => { |
There was a problem hiding this comment.
Figure out if we want to have a pattern match from the original one to make sure we don't miss one of these.
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.
Add factory functions for AST
Needs to be merged after #1518
Adds a bunch of helper functions for building up the AST with default annotations.