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.

Sign up for GitHub

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

fitsinto: rework fitsinto to actually do subtyping #48

Merged
merged 8 commits into from
Dec 9, 2023
Merged

fitsinto: rework fitsinto to actually do subtyping #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
419d00a
test-fitsinto: init with some test cases
LunNova Dec 7, 2023
8c9e4ab
fitsinto: initial implementation
LunNova Dec 7, 2023
cc36fca
fitsinto: implement star, fix some bugs
LunNova Dec 7, 2023
319b1cb
evaluator,expressions: require qtypes for operative typs
LunNova Dec 8, 2023
a8806ac
derivers, terms-generator: use . to separate kind to match lua path
LunNova Dec 8, 2023
6de9baa
evaluator,fitsinto: move fitsinto into evaluator due to cycle
LunNova Dec 8, 2023
d1740fa
test-fitsinto: use evaulator.fitsinto
LunNova Dec 8, 2023
f128a3b
fitsinto: remove unnecessary is_pi
LunNova Dec 8, 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
2 changes: 1 addition & 1 deletion alicorn-expressions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ local function primitive_operative(fn)
-- )
-- )))
local result_type = const_combinator(unrestricted(value.tuple_type(cons(cons(empty, cu_inf_type), cu_env_type))))
local inferred_type = value.pi(param_type, param_info_explicit, result_type, result_info_pure)
local inferred_type = unrestricted(value.pi(param_type, param_info_explicit, result_type, result_info_pure))
local inferrable_fn = inferrable_term.typed(inferred_type, usage_array(), typed_fn)
-- FIXME: use prim_if here
-- 5: wrap it in an operative type cons and finally an operative cons
Expand Down
12 changes: 6 additions & 6 deletions derivers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ local eq = {

local variants_checks = {}
for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local vdata = variants[vname]
local vtype = vdata.type
local vinfo = vdata.info
Expand Down Expand Up @@ -76,7 +76,7 @@ local is = {
local variants = info.variants

for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local chunk = string.format("return function(self) return self.kind == %q end", vkind)

derive_print("derive is: enum chunk: " .. vkind)
Expand Down Expand Up @@ -172,7 +172,7 @@ local pretty_print = {

local variant_printers = {}
for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local vdata = variants[vname]
local vtype = vdata.type
local vinfo = vdata.info
Expand Down Expand Up @@ -238,7 +238,7 @@ local unwrap = {
local variants = info.variants

for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local vdata = variants[vname]
local vtype = vdata.type
local vinfo = vdata.info
Expand Down Expand Up @@ -284,7 +284,7 @@ local as = {
local variants = info.variants

for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local chunk = "return function(self) return pcall(function() return self:unwrap_" .. vname .. "() end) end"

derive_print("derive as: enum chunk: " .. vkind)
Expand Down Expand Up @@ -315,7 +315,7 @@ local function trait_method(trait, method, build_record_function, specialization

local variant_impls = {}
for n, vname in ipairs(variants) do
local vkind = name .. "_" .. vname
local vkind = name .. "." .. vname
local vdata = variants[vname]
local vtype = vdata.type
local vinfo = vdata.info
Expand Down
Loading
Loading