Skip to content

Re-land P2 parser get(): 04_method.dag registry row (map_get shape) + 04_infer.dag tier-2b list-element arm (lookup/map_get precedent at 04_infer.dag:804) + regen delta per #6155 recipe + re-apply O(1) token_stream form reverted in #6253 #6265

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

Closed
gunbai-bot wants to merge 1 commit into from
Closed

Re-land P2 parser get(): 04_method.dag registry row (map_get shape) + 04_infer.dag tier-2b list-element arm (lookup/map_get precedent at 04_infer.dag:804) + regen delta per #6155 recipe + re-apply O(1) token_stream form reverted in #6253 #6265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 26 additions & 1 deletion src/v1/04_infer.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module v1.compiler.infer

import std.types { SourceSpan, container_param_name }
import std.types { SourceSpan, container_param_name, is_ordered_element_collection }
import std.coercion { dag_can_cast, is_dag_cast_domain_type }
import v1.std.core {
Node, InternTable,
Expand Down Expand Up @@ -852,6 +852,31 @@ fn infer_tier2b_builtin_with_kernel_diags(func_name: String, typed_args: List<No
}
Absent => Tier2bBt { bt: resolve_builtin_call_type(name: func_name), kernel_diags: [] }
}
} else if func_name == "get" {
Tier2bBt {
bt: match typed_args |> first {
Present { value: receiver_arg } =>
match arg_value(n: receiver_arg).inferred {
Present { value: Resolved { node: receiver_type } } =>
let normed = normalize_access_type_node(n: receiver_type)
let resolved = resolve_scrutinee_type_node(env: scope.type_env, n: normed)
let list_type = normalize_access_type_node(n: resolved)
if is_ordered_element_collection(name: authored_name_at(source_indices: scope.type_env.source_indices, node: list_type))
&& node_is_element_collection(n: list_type, source_indices: scope.type_env.source_indices)
&& !node_is_set_collection(n: list_type, source_indices: scope.type_env.source_indices) {
with_optional_cardinality(n: for_each_element_type_node(n: list_type, source_indices: scope.type_env.source_indices))
} else {
match map_value_type_in_env(type_node: receiver_type, env: scope.type_env) {
Present { value: value_type } => with_optional_cardinality(n: value_type)
Absent => resolve_builtin_call_type(name: func_name)
}
}
_ => resolve_builtin_call_type(name: func_name)
}
Absent => resolve_builtin_call_type(name: func_name)
},
kernel_diags: []
}
} else if func_name == "set_insert" || func_name == "set_union" || func_name == "set_contains" {
let operand_elem = if func_name == "set_insert" || func_name == "set_contains" {
match typed_args |> skip(1) |> first {
Expand Down
1 change: 1 addition & 0 deletions src/v1/04_method.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ fn builtin_function_registry() -> Map<String, Node> {
let m = map_insert(m, "set_contains", bool_type)
let m = map_insert(m, "lookup", witness_of_element(element: type_variable_node(id: "map_value")))
let m = map_insert(m, "map_get", with_optional_cardinality(n: type_variable_node(id: "map_value")))
let m = map_insert(m, "get", with_optional_cardinality(n: type_variable_node(id: "collection_element")))
let m = map_insert(m, "Some", with_optional_cardinality(n: type_variable_node(id: "some_inner")))
let m = map_insert(m, "map_keys", list_of_type_variable(id: "collection_element"))
let m = map_insert(m, "map_values", list_of_type_variable(id: "collection_element"))
Expand Down
Loading