Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generative labels #1169

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
b1969a3
effectalias init
Orbion-J May 13, 2022
49a9a61
desalias inline
Orbion-J May 13, 2022
36a488f
alias = effectname and typename | init
Orbion-J May 18, 2022
dbb6b5b
merge into 1 construct ok; still 2 contexts
Orbion-J May 19, 2022
84ffd9b
merge type and effect aliases contexts
Orbion-J May 20, 2022
5150615
effectname body desugared into effectname
Orbion-J May 20, 2022
ee1651e
Merge branch 'merge-typenames-effectnames'
Orbion-J May 20, 2022
a2d8bdc
Revert "desalias inline"
Orbion-J May 23, 2022
419aca4
Revert "effectname body desugared into effectname"
Orbion-J May 23, 2022
6e8c0df
"effectname" in links-mode.el
Orbion-J May 24, 2022
1355a93
cleaning before pr
Orbion-J May 24, 2022
50edb64
re-cleaning
Orbion-J May 24, 2022
ce200de
effectname -> typename _::Kind
Orbion-J May 27, 2022
c0c3e5b
Update bin/repl.ml
Orbion-J May 27, 2022
eace411
Update bin/repl.ml
Orbion-J May 27, 2022
93b2cf1
Update bin/repl.ml
Orbion-J May 27, 2022
1736097
Update bin/repl.ml
Orbion-J May 27, 2022
bb0fb30
Update bin/repl.ml
Orbion-J May 27, 2022
6206a6b
Update core/desugarDatatypes.mli
Orbion-J May 27, 2022
9a499fc
Update bin/repl.ml
Orbion-J May 27, 2022
c45fbbc
Update core/defaultAliases.ml
Orbion-J May 27, 2022
832a424
Update core/desugarDatatypes.ml
Orbion-J May 27, 2022
0bd30cd
Update core/desugarDatatypes.ml
Orbion-J May 27, 2022
35e50e8
Update core/desugarDatatypes.ml
Orbion-J May 27, 2022
14df529
rename alias_env -> tycon_env as originally
Orbion-J May 27, 2022
31dffbb
Merge branch 'master' of github.com:Orbion-J/links
Orbion-J May 27, 2022
3489b8a
idem
Orbion-J May 27, 2022
b35a3da
fixes & add primary kind in aliases
Orbion-J May 30, 2022
69f2920
new error kind mismatch
Orbion-J Jun 1, 2022
f88808d
fresh label : init
Orbion-J Jun 3, 2022
5bce834
local labels : working
Orbion-J Jun 13, 2022
dccac21
fix : embeded errors
Orbion-J Jun 13, 2022
fd82138
fixes
Orbion-J Jun 14, 2022
806570a
fix label projections
Orbion-J Jun 14, 2022
7dc5f76
fix : underscore in effect app
Orbion-J Jun 15, 2022
ca580a5
various fixes
Orbion-J Jun 15, 2022
e118c0e
short type in effectname + short fun non desugar
Orbion-J Jun 16, 2022
109ca66
comment
Orbion-J Jun 16, 2022
0ab606c
Merge branch 'master' into master
Orbion-J Jun 16, 2022
dc0682f
always desugar op type with type application
Orbion-J Jun 16, 2022
01d9a09
correction tests
Orbion-J Jun 16, 2022
56ac19b
erase local labels out of scope (err when nested)
Orbion-J Jun 20, 2022
7a9a437
nested fresh label
Orbion-J Jun 22, 2022
4b6d3f9
fix stack overflow w/ points + clean debug
Orbion-J Jun 22, 2022
fd52e08
alias stuff
Orbion-J Jun 23, 2022
aa73727
functional
Orbion-J Jun 24, 2022
99c0878
remove wrong UnboundTyCon error
Orbion-J Jun 24, 2022
07040be
Merge branch 'links-lang:master' into master
Orbion-J Jun 24, 2022
6d907e7
default arg in repl
Orbion-J Jun 24, 2022
75a4f73
Merge branch 'master' of github.com:Orbion-J/links
Orbion-J Jun 24, 2022
82641fc
alias stuff + context management
Orbion-J Jun 24, 2022
b9e25e6
wip
Orbion-J Jun 27, 2022
571ffa2
Merge branch 'master' into fresh-label
Orbion-J Jun 27, 2022
c76a41e
Merge branch 'links-lang:master' into fresh-label
Orbion-J Jun 27, 2022
38f7f3e
fold_left_map in ListUtils (not in Ocaml < 4.11)
Orbion-J Jun 27, 2022
58919f5
Merge branch 'fresh-label' of github.com:Orbion-J/links into fresh-label
Orbion-J Jun 27, 2022
6a5e7da
fix in test
Orbion-J Jun 27, 2022
310ebb4
fixes rule-check ocamlformat
Orbion-J Jun 27, 2022
152b59a
fixes rule-check ocamlformat bis
Orbion-J Jun 27, 2022
de09626
fix tests unit labels
Orbion-J Jun 27, 2022
667a886
fix Labels in tests
Orbion-J Jun 28, 2022
61ad662
fix Labels tests
Orbion-J Jun 28, 2022
589a7db
fix labels tests
Orbion-J Jun 28, 2022
3ea8ddf
fix labels tests
Orbion-J Jun 28, 2022
ab3ab86
fix labels tests
Orbion-J Jun 28, 2022
5e5dae6
change pollution test
Orbion-J Jul 22, 2022
d31a6fe
Merge branch 'fresh-label' of github.com:Orbion-J/links into Orbion-J…
dhil Jan 31, 2023
066af32
Refactor
dhil Jan 31, 2023
478c2a2
Fix bug and generalise.
dhil Jan 31, 2023
717eba0
Fix unique label resolution
dhil Jan 31, 2023
ec92181
Fix session exceptions regression
dhil Jan 31, 2023
192c437
Slight hack to make unique labels work properly with elaborated modules.
dhil Jan 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix session exceptions regression
  • Loading branch information
dhil committed Jan 31, 2023
commit ec9218108e64f4f8968bbabdb7c18f4f58f69a0f
3 changes: 2 additions & 1 deletion core/desugarSessionExceptions.ml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ object (o : 'self_type)
let outer_effects = o#lookup_effects in

let fail_cont_ty =
Types.make_pure_function_type [] (Types.empty_type) in
Types.make_operation_type [] Types.empty_type
in

let inner_effects =
effect_row
Expand Down
2 changes: 1 addition & 1 deletion core/typeSugar.ml
Original file line number Diff line number Diff line change
Expand Up @@ -4544,7 +4544,7 @@ let rec type_check : context -> phrase -> phrase * Types.datatype * Usage.t =
(T.Row (Label.Map.empty, rho, false)) in
let try_effects =
Types.row_with
(Value.session_exception_operation, T.Present (Types.make_pure_function_type [] Types.empty_type))
(Value.session_exception_operation, T.Present (Types.make_operation_type [] Types.empty_type))
(T.Row (Label.Map.empty, rho, false)) in

unify ~handle:Gripers.try_effect
Expand Down