Skip to content

Commit 0de87f8

Browse files
Merge pull request #7022 from michaellilltokiwa/base--add-full-qualifier-to-constraints
base: add full qualifier to constraints
2 parents 91033ac + a079dd8 commit 0de87f8

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

modules/base/src/container/Typed_Sequence.fz

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public Types ref : Sequence Type is
331331
#
332332
# In case this `Types` instance is empty, the result is `e`.
333333
#
334-
public type_foldf(E type, A type : type_applicator E, e E, a A) E
334+
public type_foldf(E type, A type : container.type_applicator E, e E, a A) E
335335
=>
336336
abstract
337337

modules/base/src/property/hashable.fz

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# NYI: the compiler should check that features inheriting from this are
2727
# actually immutable.
2828
#
29-
public hashable : equatable is
29+
public hashable : property.equatable is
3030

3131

3232
# create hash code for this instance

modules/base/src/property/orderable.fz

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# NYI: the compiler should check that features inheriting from this are
3232
# actually immutable.
3333
#
34-
public orderable : partially_orderable
34+
public orderable : property.partially_orderable
3535

3636
/* NYI: quantor intrinsics not supported yet:
3737

modules/base/src/property/partially_orderable.fz

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# NYI: the compiler should check that features inheriting from this are
3131
# actually immutable.
3232
#
33-
public partially_orderable : equatable
33+
public partially_orderable : property.equatable
3434

3535
/* NYI: quantor intrinsics not supported yet:
3636

tests/reg_issue6882/reg_issue6882.fz.expected_err_jvm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
error 1: java.lang.Error: No effect of reg_issue6882.lm instated.
3-
at fzC__L1505_reg_issue6__all__INTERN_fun1__call__INTERN_fun2__call.fzRoutine(--CURDIR--/reg_issue6882.fz)
3+
at fzC__L1500_reg_issue6__all__INTERN_fun1__call__INTERN_fun2__call.fzRoutine(--CURDIR--/reg_issue6882.fz)
44
at fzC_3instate_helper_unit_panic__call_code__call.fzRoutine({base.fum}/effect.fz:439)
55
at fzC_3instate_helper_unit_panic.fzRoutine({base.fum}/effect.fz:434)
66
at fzC_panic_INTERN_type_panic__3instate_unit.fzRoutine({base.fum}/effect.fz:170)
77
at fzC_eff__1try_String_panic_unit__1catch0.fzRoutine({base.fum}/eff/try.fz:63)
88
at fzC_eff__1try_String_panic_unit__1catch__INTERN_fun5__call.fzRoutine({base.fum}/eff/try.fz:50)
9-
at fzC__L888_3instate_h___try_String_panic_unit_lm__call_code__call.fzRoutine({base.fum}/effect.fz:439)
9+
at fzC__L885_3instate_h___try_String_panic_unit_lm__call_code__call.fzRoutine({base.fum}/effect.fz:439)
1010
at fzC_3instate_helper__unit__eff_try_String_panic_unit_lm.fzRoutine({base.fum}/effect.fz:434)
11-
at fzC__L863_eff_INTERN__ff_try_String_panic_unit_lm__3instate_unit.fzRoutine({base.fum}/effect.fz:170)
12-
at fzC__L852_eff_INTERN__ff_try_String_panic_unit_lm__2instate_unit.fzRoutine({base.fum}/effect.fz:191)
11+
at fzC__L860_eff_INTERN__ff_try_String_panic_unit_lm__3instate_unit.fzRoutine({base.fum}/effect.fz:170)
12+
at fzC__L849_eff_INTERN__ff_try_String_panic_unit_lm__2instate_unit.fzRoutine({base.fum}/effect.fz:191)
1313
at fzC_eff__1try_String_panic_unit__lm__1instate_self_unit.fzRoutine({base.fum}/effect.fz:212)
1414
at fzC_eff__1try_String_panic_unit__lm__1infix_not_unit.fzRoutine({base.fum}/effect.fz:229)
1515
at fzC_eff__1try_String_panic_unit__1catch.fzRoutine({base.fum}/eff/try.fz:49)

0 commit comments

Comments
 (0)