Skip to content

Commit 599bd07

Browse files
committed
fix(manhattan-recovery): update TyArrow arity to 4-args in parser + julia backend
The Manhattan Recovery commit bundled the pre-existing grammar refactor that added a quantity field to TyArrow (3-arg -> 4-arg). Two call sites in parser.mly (type_expr_arrow productions) and julia_codegen.ml (type_expr_to_julia_string) were at line locations where the auto-merge with origin/main took upstream's 3-arg version without conflict markers. Post-cherry-pick build fix — adds the missing quantity argument (None) in all three call sites. No semantic change.
1 parent b165468 commit 599bd07

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/julia_codegen.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ let rec type_expr_to_julia_string (te : type_expr) : string =
5757
| TyCon name when name.name = "String" -> "String"
5858
| TyCon name when name.name = "Unit" -> "Nothing"
5959
| TyCon name -> name.name (* Custom type names pass through *)
60-
| TyArrow (_, ret, _) ->
60+
| TyArrow (_, _, ret, _) ->
6161
(* Function types: for now, just use ret type annotation *)
6262
type_expr_to_julia_string ret
6363
| TyTuple tys ->

lib/parser.mly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ type_expr:
249249

250250
type_expr_arrow:
251251
| arg = type_expr_primary ARROW ret = type_expr_arrow
252-
{ TyArrow (arg, ret, None) }
252+
{ TyArrow (arg, None, ret, None) }
253253
| arg = type_expr_primary MINUS LBRACE eff = effect_expr RBRACE ARROW ret = type_expr_arrow
254-
{ TyArrow (arg, ret, Some eff) }
254+
{ TyArrow (arg, None, ret, Some eff) }
255255
| ty = type_expr_primary { ty }
256256

257257
type_expr_primary:

0 commit comments

Comments
 (0)